mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
Merge branch 'package-management'
Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
This commit is contained in:
Oliver Tappe
@@ -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}
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
152
app-shells/fish/patches/fish-1.23.1_git.patch
Normal file
152
app-shells/fish/patches/fish-1.23.1_git.patch
Normal file
@@ -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
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user