Merge all changes from trunk

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"

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

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

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
 }
 

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."