Initial import.

(Portage version: 2.1.2-r4)

17 files changed, 1170 insertions, 0 deletions

diff --git a/dev-lang/xsb/files/digest-xsb-3.0.1 b/dev-lang/xsb/files/digest-xsb-3.0.1
new file mode 100644
index 000000000000..9cb6dd1accb7
--- /dev/null
+++ b/dev-lang/xsb/files/digest-xsb-3.0.1
@@ -0,0 +1,3 @@
+MD5 eafb4b8b4067e3277776f28b10df4edc xsb-3.0.1-src.tar.gz 4523327
+RMD160 6f71401ad3cc9031ec0ced16df7d9dfd594b3fb2 xsb-3.0.1-src.tar.gz 4523327
+SHA256 05e2a76befe6303ff624c8a22543444604a75815eae276e065e462a1d21ae801 xsb-3.0.1-src.tar.gz 4523327
diff --git a/dev-lang/xsb/files/xsb-3.0.1-chr_d.patch b/dev-lang/xsb/files/xsb-3.0.1-chr_d.patch
new file mode 100644
index 000000000000..0506e87032c2
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-chr_d.patch
@@ -0,0 +1,12 @@
+--- XSB.orig/packages/chr_d.P	2006-05-26 02:49:06.000000000 +1200
++++ XSB/packages/chr_d.P	2007-01-26 20:38:58.000000000 +1300
+@@ -28,7 +28,8 @@
+ init_chr_d:- 
+ 	bootstrap_package([chr_d],'chr_d'),
+ 	[chr2attv],
+-	[attv_aux].
++	[attv_aux],
++	[print_chrd].
+ 
+ :- init_chr_d.
+ 
diff --git a/dev-lang/xsb/files/xsb-3.0.1-configure.patch b/dev-lang/xsb/files/xsb-3.0.1-configure.patch
new file mode 100644
index 000000000000..a4cf79cbd1b3
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-configure.patch
@@ -0,0 +1,210 @@
+--- XSB.orig/build/configure.in	2006-06-25 13:08:48.000000000 +1200
++++ XSB/build/configure.in	2007-01-28 12:01:01.000000000 +1300
+@@ -258,9 +258,9 @@
+ dnl prefix given by the user. The prefix variable will later get
+ dnl the <xsb-version> subdirectory added in.
+ orig_prefix=
+-if test "$prefix" = "NONE" -o -z "$prefix" ; then
++if test true ; then
++    install_prefix=$prefix/lib/xsb
+     prefix=$topdir
+-    orig_prefix=$prefix
+ else
+     dnl strip any trailing slashes in prefix
+     prefix=`echo "${prefix}" | sed 's,\([[^/]]\)/*$,\1,'`
+@@ -321,7 +321,7 @@
+ fi
+ 
+ config_prefix=${topdir}/config
+-install_config_prefix=${prefix}/config
++install_config_prefix=${install_prefix}/config
+ 
+ if test "$config_tag" != "NONE" -a -n "$config_tag" ; then
+     config_tag="-$config_tag"
+@@ -431,11 +431,11 @@
+     config_dot_h_templ=def_config.in
+ 
+     dnl Check configuration for a Unix variant
+-    if test "$configuration" = "NONE" ; then
+-        echo '
+-- You did not tell me what kind of host system you want to configure.
+-- I will attempt to guess the kind of system this is.
+-' 1>&6
++    if test "NONE$configuration" = "NONE" ; then
++#        echo '
++#- You did not tell me what kind of host system you want to configure.
++#- I will attempt to guess the kind of system this is.
++#' 1>&6
+         AC_CANONICAL_HOST
+         canonical=$host
+         configuration=$host_alias
+@@ -502,7 +502,7 @@
+ 
+ # site-specific directories
+ # where the site is
+-test "$site_prefix" = "NONE" && site_prefix=${orig_prefix}/site
++test "NONE$site_prefix" = "NONE" && site_prefix=${install_prefix}/site
+ # site-specific config-independent XSB libraries
+ site_libdir=${site_prefix}/lib
+ # site-specific config-dependent stuff goes
+@@ -511,17 +511,17 @@
+ site_config_libdir=${site_config_prefix}/lib
+ 
+ # Installation directories: We only check if they exist
+-install_libdir=${prefix}/lib
+-install_syslibdir=${prefix}/syslib
+-install_cmplibdir=${prefix}/cmplib
+-install_emudir=${prefix}/emu
+-install_scriptdir=${prefix}/bin     # where the xsb invocation script goes
+-install_builddir=${prefix}/build    # where the config detection scripts go
+-install_prolog_includes=${prefix}/prolog_includes
+-install_pkgdir=${prefix}/packages
+-install_pkgxmcdir=${prefix}/packages/xmc
+-install_examples=${prefix}/examples
+-install_etcdir=${prefix}/etc
++install_libdir=${install_prefix}/lib
++install_syslibdir=${install_prefix}/syslib
++install_cmplibdir=${install_prefix}/cmplib
++install_emudir=${install_prefix}/emu
++install_scriptdir=${install_prefix}/bin     # where the xsb invocation script goes
++install_builddir=${install_prefix}/build    # where the config detection scripts go
++install_prolog_includes=${install_prefix}/prolog_includes
++install_pkgdir=${install_prefix}/packages
++install_pkgxmcdir=${install_prefix}/packages/xmc
++install_examples=${install_prefix}/examples
++install_etcdir=${install_prefix}/etc
+ 
+ arch_install_config_prefix=${install_config_prefix}/${full_config_name}
+ arch_install_bindir=${arch_install_config_prefix}/bin
+@@ -550,7 +550,7 @@
+   rm -f  buildxsb.lock
+   exit 1
+ fi
+-
++if false ; then
+ # Test if directories exist
+ echo "Checking installation directories..."
+ 
+@@ -670,7 +670,7 @@
+ test -f .missingdirs.tmp && exit 1
+ 
+ echo "Checking installation directories ... Done"
+-
++fi
+ 
+ AC_PROG_CC
+ AC_PROG_CPP
+@@ -1024,11 +1024,11 @@
+ #	    with_odbc=no
+ #	else
+ #	    AC_DEFINE(XSB_ODBC)
+-        cat <<EOT
+-
+-Building with support for ODBC
+-
+-EOT
++#        cat <<EOT
++#
++#Building with support for ODBC
++#
++#EOT
+ #	fi
+ #	dnl restore CPPFLAGS
+ #	CPPFLAGS="${saved_cpp_flags}"
+@@ -1132,8 +1132,8 @@
+ AC_SUBST(perl_ccflags)
+ AC_SUBST(perl_libs)
+ 
+-
+-# Java support
++if test "${with_interprolog}" = "yes"; then
++if test "x$JAVAC" = x; then
+ AC_CHECK_PROG(java_support, javac, "yes", "no")
+ if test "${java_support}" = "yes"; then
+     dnl after AC_CHECK_PROG, ac_dir holds the directory where javac is found
+@@ -1141,17 +1141,20 @@
+ else
+     javac=javac
+ fi
+-
++else
++  javac="$JAVAC"
++  java_support=yes
++fi
+ AC_SUBST(javac)
+ AC_SUBST(java_support)
+ 
+-AC_PATH_PROG(java_path,javac,no)
+-java_path=`dirname $java_path`
++#AC_PATH_PROG(java_path,javac,no)
++java_path=`dirname $javac`
+ java_path=`dirname $java_path`
+ java_path=$java_path/include
+ #java_path=`echo $java_path | sed 's,bin/javac,include,' `
+ 
+-if test "${with_interprolog}" = "yes"; then
++#if test "${with_interprolog}" = "yes"; then
+     if test "${java_support}" != "yes"; then
+         echo "Interprolog not supported due to failure to find Java"
+         with_interprolog=""
+@@ -1553,11 +1556,11 @@
+                 LINKFLAGS="-lodbc32 ${LINKFLAGS}"
+         ;;
+     *)          if test -n "${with_iodbc}"; then
+-                    LDFLAGS="-liodbc ${LDFLAGS}"
+-                    LINKFLAGS="-liodbc ${LINKFLAGS}"
++                    LDFLAGS="$(iodbc-config --libs) ${LDFLAGS}"
++#                    LINKFLAGS="-liodbc ${LINKFLAGS}"
+                 else
+-                    LDFLAGS="-lodbc ${LDFLAGS}"
+-                    LINKFLAGS="-lodbc ${LINKFLAGS}"
++                    LDFLAGS="$(odbc_config --libs) ${LDFLAGS}"
++#                    LINKFLAGS="-lodbc ${LINKFLAGS}"
+                 fi
+     esac
+ fi
+@@ -1726,11 +1729,11 @@
+ AC_SUBST(xsb_asm_extension)
+ AC_SUBST(xsb_dcl_extension)
+ 
+-AC_OUTPUT([ ${arch_config_prefix}/topMakefile:topMakefile.in
+-        ${arch_config_prefix}/emuMakefile:emuMakefile.in
+-        ${arch_config_prefix}/modMakefile:modMakefile.in
+-        ${arch_config_prefix}/gppMakefile:gppMakefile.in
+-        ${arch_config_prefix}/smoMakefile:smoMakefile.in
++AC_OUTPUT([ ${build_dir}/Makefile:topMakefile.in
++        ${emudir}/Makefile:emuMakefile.in
++        ${build_dir}/modMakefile:modMakefile.in
++        ${topdir}/gpp/Makefile:gppMakefile.in
++        ${build_dir}/smoMakefile:smoMakefile.in
+         ${arch_config_prefix}/makedef.sh:makedef.sh.in
+         ${arch_config_file}:${configuration_templ}
+         makexsb:makexsb.in
+@@ -1854,10 +1857,10 @@
+ 
+ # This is needed so that *after* XSB is installed in a common directory,
+ # users could compile packages that produce arch-specific code.
+-chmod 777 ${site_config_libdir};
+-chmod a+t ${site_config_libdir};
+-chmod 777 ${arch_install_config_libdir};
+-chmod a+t ${arch_install_config_libdir};
++# chmod 777 ${site_config_libdir};
++# chmod a+t ${site_config_libdir};
++# chmod 777 ${arch_install_config_libdir};
++# chmod a+t ${arch_install_config_libdir};
+ 
+ 
+ dnl Add site dynamic libraries to XSB library path
+@@ -1904,9 +1907,9 @@
+ # configuring for Windows over Samba, NFS, etc.
+ chmod 644 ${arch_config_file} \
+       ${arch_config_prefix}/xsb_config.h \
+-      ${arch_config_prefix}/xsb_debug.h \
+-      ${arch_config_prefix}/*Makefile \
+-      ${arch_config_prefix}/MSVC*
++      ${arch_config_prefix}/xsb_debug.h
++#      ${arch_config_prefix}/*Makefile \
++#      ${arch_config_prefix}/MSVC*
+ 
+ 
+ # phantom private_builtin.c file
diff --git a/dev-lang/xsb/files/xsb-3.0.1-gap.patch b/dev-lang/xsb/files/xsb-3.0.1-gap.patch
new file mode 100644
index 000000000000..245e5f0b1e51
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-gap.patch
@@ -0,0 +1,10 @@
+--- XSB.orig/packages/gap.P	1999-12-31 07:20:55.000000000 +1300
++++ XSB/packages/gap.P	2007-01-26 19:43:27.000000000 +1300
+@@ -33,5 +33,6 @@
+ 
+ gap_meta(Call):- meta(Call).
+ 
+-:- bootstrap_package('gap',gap).
++:- bootstrap_package('gap',gap),
++   [gapmeta].
+ 
diff --git a/dev-lang/xsb/files/xsb-3.0.1-justify.patch b/dev-lang/xsb/files/xsb-3.0.1-justify.patch
new file mode 100644
index 000000000000..20a9143a5318
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-justify.patch
@@ -0,0 +1,12 @@
+--- XSB.orig/packages/justify.P	2006-01-02 11:03:26.000000000 +1300
++++ XSB/packages/justify.P	2007-01-26 20:01:49.000000000 +1300
+@@ -11,7 +11,8 @@
+ 
+ :- import bootstrap_package/2 from packaging.
+ :- import slash/1 from machine.
+-:- bootstrap_package('justify',justify).
++:- bootstrap_package('justify',justify),
++   [jxm].
+ 
+ :- import jxm_/1, just_true_/2, just_false_/2 from jxm.
+ 
diff --git a/dev-lang/xsb/files/xsb-3.0.1-libwww.patch b/dev-lang/xsb/files/xsb-3.0.1-libwww.patch
new file mode 100644
index 000000000000..478df6b2115e
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-libwww.patch
@@ -0,0 +1,54 @@
+diff -ur XSB.orig/packages/libwww/cc/libwww_parse_html.c XSB/packages/libwww/cc/libwww_parse_html.c
+--- XSB.orig/packages/libwww/cc/libwww_parse_html.c	2003-12-31 14:04:51.000000000 +1300
++++ XSB/packages/libwww/cc/libwww_parse_html.c	2007-01-27 16:42:10.000000000 +1300
+@@ -138,7 +138,7 @@
+ 
+   /* put the text string into the elt term and then pop it */
+   if (context->convert2list)
+-    c2p_chars(pcdata_buf.string+shift, p2p_arg(STACK_TOP(htext).elt_term,3));
++    c2p_chars(pcdata_buf.string+shift, 4, p2p_arg(STACK_TOP(htext).elt_term,3));
+   else 
+     c2p_string(pcdata_buf.string+shift, p2p_arg(STACK_TOP(htext).elt_term,3));
+ 
+diff -ur XSB.orig/packages/libwww/cc/libwww_parse_xml.c XSB/packages/libwww/cc/libwww_parse_xml.c
+--- XSB.orig/packages/libwww/cc/libwww_parse_xml.c	2003-12-31 14:04:51.000000000 +1300
++++ XSB/packages/libwww/cc/libwww_parse_xml.c	2007-01-27 16:42:44.000000000 +1300
+@@ -174,7 +174,7 @@
+ 
+   /* put the text string into the elt term and then pop it */
+   if (context->convert2list)
+-    c2p_chars(pcdata_buf.string+shift,
++    c2p_chars(pcdata_buf.string+shift, 4,
+ 	      p2p_arg(STACK_TOP(userdata_obj).elt_term,3));
+   else
+     c2p_string(pcdata_buf.string+shift,
+diff -ur XSB.orig/packages/libwww/cc/libwww_request.c XSB/packages/libwww/cc/libwww_request.c
+--- XSB.orig/packages/libwww/cc/libwww_request.c	2005-02-27 08:19:51.000000000 +1300
++++ XSB/packages/libwww/cc/libwww_request.c	2007-01-27 16:46:55.000000000 +1300
+@@ -959,7 +959,7 @@
+ 
+     if (result_as_string) {
+       if (context->convert2list)
+-	c2p_chars(result_as_string, context->request_result);
++	c2p_chars(result_as_string, 5, context->request_result);
+       else c2p_string(result_as_string, context->request_result);
+     }
+     /* Note: HTChunk_toCString frees the chunk, and here we free the chank
+diff -ur XSB.orig/packages/libwww/configure XSB/packages/libwww/configure
+--- XSB.orig/packages/libwww/configure	2003-09-29 20:26:50.000000000 +1200
++++ XSB/packages/libwww/configure	2007-01-27 17:01:15.000000000 +1300
+@@ -562,10 +562,10 @@
+ 
+ 
+ if test -z "$with_config"; then
+-echo '
+-- You did not tell me what kind of host system you want to configure.
+-- I will attempt to guess the kind of system this is.
+-' 1>&6
++#echo '
++#- You did not tell me what kind of host system you want to configure.
++#- I will attempt to guess the kind of system this is.
++#' 1>&6
+     
+ # Make sure we can run config.sub.
+ if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
diff --git a/dev-lang/xsb/files/xsb-3.0.1-mysql.patch b/dev-lang/xsb/files/xsb-3.0.1-mysql.patch
new file mode 100644
index 000000000000..b7949f740ea0
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-mysql.patch
@@ -0,0 +1,90 @@
+diff -ur XSB.orig/packages/dbdrivers/mysql/cc/mysql_driver_defs.h XSB/packages/dbdrivers/mysql/cc/mysql_driver_defs.h
+--- XSB.orig/packages/dbdrivers/mysql/cc/mysql_driver_defs.h	2006-02-12 18:21:03.000000000 +1300
++++ XSB/packages/dbdrivers/mysql/cc/mysql_driver_defs.h	2007-01-28 12:01:01.000000000 +1300
+@@ -35,7 +35,7 @@
+ #include "driver_manager_defs.h"
+ 
+ #define MAX_HANDLES 25
+-#define MAX_QUERIES 25
++#define MAX_QUERIES 100
+ 
+ /****** data structures for handles *****/
+ 
+diff -ur XSB.orig/packages/dbdrivers/mysql/configure XSB/packages/dbdrivers/mysql/configure
+--- XSB.orig/packages/dbdrivers/mysql/configure	2003-09-29 21:40:02.000000000 +1200
++++ XSB/packages/dbdrivers/mysql/configure	2007-01-28 12:01:01.000000000 +1300
+@@ -564,10 +564,10 @@
+ 
+ 
+ if test -z "$with_config"; then
+-echo '
+-- You did not tell me what kind of host system you want to configure.
+-- I will attempt to guess the kind of system this is.
+-' 1>&6
++#echo '
++#- You did not tell me what kind of host system you want to configure.
++#- I will attempt to guess the kind of system this is.
++#' 1>&6
+     
+ # Make sure we can run config.sub.
+ if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+@@ -626,8 +626,8 @@
+    LDFLAGS="-L${libdir} ${LDFLAGS}"
+ fi
+ 
+-echo $ac_n "checking for  in -lmysqlclient""... $ac_c" 1>&6
+-echo "configure:631: checking for  in -lmysqlclient" >&5
++echo $ac_n "checking for mysql_init in -lmysqlclient""... $ac_c" 1>&6
++echo "configure:631: checking for mysql_init in -lmysqlclient" >&5
+ ac_lib_var=`echo mysqlclient'_' | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -640,10 +640,10 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char ();
++char mysql_init ();
+ 
+ int main() {
+-()
++return mysql_init();
+ ; return 0; }
+ EOF
+ if { (eval echo configure:650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -661,9 +661,9 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  mysql_error=yes
+ else
+   echo "$ac_t""no" 1>&6
++  mysql_error=yes
+ fi
+ 
+ # Here we provide additional directories to check headers in
+@@ -808,10 +808,8 @@
+ support=yes
+ fi
+ 
+-
+-
+-
+-
++CFLAGS=`mysql_config --cflags`
++LDFLAGS=`mysql_config --libs`
+ 
+ 
+ 
+diff -ur XSB.orig/packages/dbdrivers/mysql/mysql_driver_config.P XSB/packages/dbdrivers/mysql/mysql_driver_config.P
+--- XSB.orig/packages/dbdrivers/mysql/mysql_driver_config.P	2006-02-12 18:21:04.000000000 +1300
++++ XSB/packages/dbdrivers/mysql/mysql_driver_config.P	2007-01-28 21:23:55.000000000 +1300
+@@ -43,7 +43,7 @@
+ 	%% Creates something like -Wl,-rpath,<libdir>
+ 	runtime_loader_flag(XCC, MysqlLibdir, MysqlRunpathFlag),
+ 	fmt_write_string(LD_flags,
+-			 ' %s %s -lmysqlclient -ldl %s%sdriver_manager.so %s%smysql_driver.so', f(MysqlRunpathFlag, MysqlLibdir_flag, ConfigLibdir, Slash, ConfigLibdir, Slash)),
++			 ' %s %s -lmysqlclient -ldl ./driver_manager.so', f(MysqlRunpathFlag, MysqlLibdir_flag)),
+ 	package_configuration(dir(mysql_driver), MySQLDriverDir),
+ 	fmt_write_string(LD_directives_file,
+ 			 '%s%scc%smysql_driver.H', f(MySQLDriverDir, Slash, Slash)),
diff --git a/dev-lang/xsb/files/xsb-3.0.1-nostrip.patch b/dev-lang/xsb/files/xsb-3.0.1-nostrip.patch
new file mode 100644
index 000000000000..0d601c4d9f0e
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-nostrip.patch
@@ -0,0 +1,11 @@
+--- XSB.orig/lib/foreign.P	2006-06-12 09:41:56.000000000 +1200
++++ XSB/lib/foreign.P	2007-01-28 21:51:52.000000000 +1300
+@@ -104,7 +104,7 @@
+ 	%% If not debugging, the strip the symbol table from the result
+ 	(  str_sub(' -g', CC_Opts)
+ 	-> SymbolTableFlag = ' '
+-	;  SymbolTableFlag = ' -s'
++	;  SymbolTableFlag = ' '
+ 	),
+ 	(   var(CompComm)
+ 	->  (	str_sub('solaris', Configuration)
diff --git a/dev-lang/xsb/files/xsb-3.0.1-odbc.patch b/dev-lang/xsb/files/xsb-3.0.1-odbc.patch
new file mode 100644
index 000000000000..bc3b6207d3f8
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-odbc.patch
@@ -0,0 +1,81 @@
+diff -ur XSB.orig/packages/dbdrivers/odbc/configure XSB/packages/dbdrivers/odbc/configure
+--- XSB.orig/packages/dbdrivers/odbc/configure	2003-09-29 21:40:01.000000000 +1200
++++ XSB/packages/dbdrivers/odbc/configure	2007-01-28 12:01:01.000000000 +1300
+@@ -564,10 +564,10 @@
+ 
+ 
+ if test -z "$with_config"; then
+-echo '
+-- You did not tell me what kind of host system you want to configure.
+-- I will attempt to guess the kind of system this is.
+-' 1>&6
++#echo '
++#- You did not tell me what kind of host system you want to configure.
++#- I will attempt to guess the kind of system this is.
++#' 1>&6
+     
+ # Make sure we can run config.sub.
+ if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+@@ -626,8 +626,8 @@
+    LDFLAGS="-L${with_odbc_libdir} ${LDFLAGS}"
+ fi
+ 
+-echo $ac_n "checking for  in -lodbc""... $ac_c" 1>&6
+-echo "configure:631: checking for  in -lodbc" >&5
++echo $ac_n "checking for SQLAllocEnv in -lodbc""... $ac_c" 1>&6
++echo "configure:631: checking for SQLAllocEnv in -lodbc" >&5
+ ac_lib_var=`echo odbc'_' | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -640,10 +640,10 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char ();
++char SQLAllocEnv ();
+ 
+ int main() {
+-()
++return SQLAllocEnv ();
+ ; return 0; }
+ EOF
+ if { (eval echo configure:650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -661,9 +661,9 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  odbc_error=yes
+ else
+   echo "$ac_t""no" 1>&6
++  odbc_error=yes
+ fi
+ 
+ 
+@@ -809,9 +809,9 @@
+ support=yes
+ fi
+ 
+-
+-
+-
++libdir=`odbc_config --lib-prefix`
++CFLAGS=`odbc_config --cflags`
++LDFLAGS=`odbc_config --libs`
+ 
+ 
+ 
+diff -ur XSB.orig/packages/dbdrivers/odbc/odbc_driver_config.P XSB/packages/dbdrivers/odbc/odbc_driver_config.P
+--- XSB.orig/packages/dbdrivers/odbc/odbc_driver_config.P	2006-02-12 18:21:03.000000000 +1300
++++ XSB/packages/dbdrivers/odbc/odbc_driver_config.P	2007-01-28 21:05:54.000000000 +1300
+@@ -64,9 +64,8 @@
+ 			       ConfigLibDir, Slash, ConfigLibDir, Slash))
+ 	; %% other unixes
+ 	    fmt_write_string(LD_flags,
+-			     ' %s %s %s%sdriver_manager.so %s%sodbc_driver.so -lodbc -ldl',
+-			     f(OdbcRunpathFlag, ODBC_libdir_flag, 
+-			       ConfigLibDir, Slash, ConfigLibDir, Slash))
++			     ' %s %s ./driver_manager.so -lodbc -ldl',
++			     f(OdbcRunpathFlag, ODBC_libdir_flag))
+ 	),
+ 	package_configuration(dir(odbc_driver), ODBCDriverDir),
+ 	fmt_write_string(LD_directives_file,
diff --git a/dev-lang/xsb/files/xsb-3.0.1-packages.patch b/dev-lang/xsb/files/xsb-3.0.1-packages.patch
new file mode 100644
index 000000000000..a8e3fd28af6c
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-packages.patch
@@ -0,0 +1,173 @@
+--- XSB.orig/packages/Makefile	2006-05-22 14:10:22.000000000 +1200
++++ XSB/packages/Makefile	2007-01-28 21:05:11.000000000 +1300
+@@ -22,17 +22,63 @@
+ ## 
+ ##
+ 
++config_libdir=../config/*/lib
++
+ OBJEXT=.xwam
+ 
+-ALL = 	slx${OBJEXT} perlmatch${OBJEXT} gap${OBJEXT} \
+-	regmatch${OBJEXT} wildmatch${OBJEXT} \
+-	xasp${OBJEXT} libwww${OBJEXT} xsbdoc${OBJEXT} \
+-	xmc${OBJEXT} justify${OBJEXT}
++#ALL = 
++ALL = chr.xwam chr_d.xwam gap.xwam justify.xwam regmatch.xwam sgml.xwam slx.xwam wildmatch.xwam
+ 
+-SUBDIR = flora2 slx perlmatch gap regmatch wildmatch libwww xasp \
+-	 xsbdoc xmc justify
++#SUBMODULES = 
++SUBMODULES = chr/chr_interp.xwam chr/chr_pp.xwam chr_d/attv_aux.xwam chr_d/chr2attv.xwam chr_d/print_chrd.xwam gap/gapmeta.xwam justify/jxm.xwam regmatch/regmtchconfig.xwam sgml/sgmlconfig.xwam slx/slxshell.xwam wildmatch/wldmtchconfig.xwam
++#SUBMODULES = xsbdoc/autodoc.xwam xsbdoc/autodocformats.xwam xsbdoc/ciaoaux.xwam xsbdoc/full_ciao_ops.xwam xsbdoc/rewrite_command.xwam xsbdoc/xsbdoc1.xwam xsbdoc/xsbdoc_term_proc.xwam
++
++#ARCHMODULES = 
++ARCHMODULES = $(config_libdir)/sgml2pl.xwam $(config_libdir)/xsb_re_match.xwam $(config_libdir)/xsb_wildmatch.xwam
++
++#SOLIBS = 
++SOLIBS = $(config_libdir)/sgml2pl.so $(config_libdir)/xsb_re_match.so $(config_libdir)/xsb_wildmatch.so
++
++#HEADERS = 
++HEADERS = regmatch/cc/xsb_re_match.H sgml/cc/sgml2pl.H wildmatch/cc/xsb_wildmatch.H
++
++DBDRIVERS = dbdrivers.xwam
++DBDRIVERSSUBMODULES = dbdrivers/db_interface.xwam
++DBDRIVERSARCHMODULES = $(config_libdir)/driver_manager.xwam
++DBDRIVERSSOLIBS = $(config_libdir)/driver_manager.so
++DBDRIVERSHEADERS = dbdrivers/db_interface.H dbdrivers/cc/driver_manager.H
++
++LIBWWW = libwww.xwam
++LIBWWWSUBMODULES = libwww/libwww_init.xwam libwww/libwwwconfig.xwam
++LIBWWWARCHMODULES = $(config_libdir)/libwww_request.xwam
++LIBWWWSOLIBS = $(config_libdir)/libwww_parse_html.so $(config_libdir)/libwww_parse_rdf.so $(config_libdir)/libwww_parse_xml.so $(config_libdir)/libwww_request.so
++LIBWWWHEADERS = libwww/cc/libwww_request.H
++
++MYSQL = dbdrivers/mysql.xwam
++MYSQLSUBMODULES = dbdrivers/mysql/mysql_driver_config.xwam dbdrivers/mysql/mysql_init.xwam
++MYSQLARCHMODULES = $(config_libdir)/mysql_driver.xwam
++MYSQLSOLIBS = $(config_libdir)/mysql_driver.so
++MYSQLHEADERS = dbdrivers/mysql/cc/mysql_driver.H
++
++ODBC = dbdrivers/odbc.xwam
++ODBCSUBMODULES = dbdrivers/odbc/odbc_driver_config.xwam dbdrivers/odbc/odbc_init.xwam
++ODBCARCHMODULES = $(config_libdir)/odbc_driver.xwam
++ODBCSOLIBS = $(config_libdir)/odbc_driver.so
++ODBCHEADERS = dbdrivers/odbc/cc/odbc_driver.H
++
++PERLMATCH = perlmatch.xwam
++PERLSUBMODULES = perlmatch/plmchconfig.xwam perlmatch/plmchshell.xwam
++PERLARCHMODULES = $(config_libdir)/xsbpattern.xwam
++PERLSOLIBS = $(config_libdir)/xsbpattern.so
++PERLHEADERS = perlmatch/cc/xsbpattern.H
++
++XPATH = xpath.xwam
++XPATHSUBMODULES = xpath/xpath_init.xwam xpath/xpathconfig.xwam
++XPATHARCHMODULES = $(config_libdir)/xpathparser.xwam
++XPATHSOLIBS = $(config_libdir)/xpathparser.so
++XPATHHEADERS = xpath/cc/xpathparser.H
+ 
+-Option = [optimize]
++Option = [optimize,quit_on_error]
+ 
+ #-----------------------------------------------------------------------#
+ #
+@@ -51,20 +97,28 @@
+ 
+ 
+ # continue to the next when one error occurs
+-.IGNORE:
++#.IGNORE:
+ 
+ # suffix rules
+ .SUFFIXES: .P ${OBJEXT} .H
+ 
+ .P${OBJEXT}:
+-	echo 'mc($*, $(Option)).' >> cmd...
+-
++	echo 'mc($*, $(Option)). [$*].' >> cmd...
+ 
+ all:  init $(ALL) finish $(SUBDIR)
+ 	@../build/touch.sh cmd...
+ 	$(Prolog) < cmd...
+ 	@rm cmd...
+ 	@cat $(SVFILE)
++	@for f in $(ARCHMODULES) $(SOLIBS) $(SUBMODULES) $(HEADERS); do \
++	  if [ ! -f $$f ]; then echo "$$f not build"; exit 1; fi; \
++	done
++
++dbdrivers/mysql.xwam: dbdrivers/mysql.P
++	echo 'mc($*, $(Option)). [dbdrivers], [mysql].' >> cmd...
++
++dbdrivers/odbc.xwam: dbdrivers/odbc.P
++	echo 'mc($*, $(Option)). [dbdrivers], [odbc].' >> cmd...
+ 
+ # clpqr::
+ # 	@echo ""
+@@ -82,13 +136,61 @@
+ 	@echo ""
+ 	cd iprolog; make
+ 
+-libwww::
+-	@echo ""
+-	cd libwww; make
++dbdrivers:  init $(DBDRIVERS) finish
++	@../build/touch.sh cmd...
++	$(Prolog) < cmd...
++	@rm cmd...
++	@cat $(SVFILE)
++	@for f in $(DBDRIVERSARCHMODULES) $(DBDRIVERSSOLIBS) $(DBDRIVERSSUBMODULES) $(DBDRIVERSHEADERS); do \
++	  if [ ! -f $$f ]; then echo "$$f not build"; exit 1; fi; \
++	done
+ 
+-perlmatch::
+-	@echo ""
+-	cd perlmatch; make
++libwww:  init $(LIBWWW) finish
++	@../build/touch.sh cmd...
++	$(Prolog) < cmd...
++	@rm cmd...
++	@cat $(SVFILE)
++	@for f in $(LIBWWWARCHMODULES) $(LIBWWWSOLIBS) $(LIBWWWSUBMODULES) $(LIBWWWHEADERS); do \
++	  if [ ! -f $$f ]; then echo "$$f not build"; exit 1; fi; \
++	done
++
++mysql:  dbdrivers init $(MYSQL) finish
++	@cp ../config/*/lib/driver_manager.so ./
++	@../build/touch.sh cmd...
++	$(Prolog) < cmd...
++	@rm cmd...
++	@cat $(SVFILE)
++	@for f in $(MYSQL) $(MYSQLARCHMODULES) $(MYSQLSOLIBS) $(MYSQLSUBMODULES) $(MYSQLHEADERS); do \
++	  if [ ! -f $$f ]; then echo "$$f not build"; exit 1; fi; \
++	done
++
++odbc:  dbdrivers init $(ODBC) finish
++	@cp ../config/*/lib/driver_manager.so ./
++	@../build/touch.sh cmd...
++	$(Prolog) < cmd...
++	@rm cmd...
++	@cat $(SVFILE)
++	@for f in $(ODBC) $(ODBCARCHMODULES) $(ODBCSOLIBS) $(ODBCSUBMODULES) $(ODBCHEADERS); do \
++	  if [ ! -f $$f ]; then echo "$$f not build"; exit 1; fi; \
++	done
++
++perlmatch:  init $(PERLMATCH) finish
++	@../build/touch.sh cmd...
++	$(Prolog) < cmd...
++	@rm cmd...
++	@cat $(SVFILE)
++	@for f in $(PERLARCHMODULES) $(PERLSOLIBS) $(PERLSUBMODULES) $(PERLHEADERS); do \
++	  if [ ! -f $$f ]; then echo "$$f not build"; exit 1; fi; \
++	done
++
++xpath:  init $(XPATH) finish
++	@../build/touch.sh cmd...
++	$(Prolog) < cmd...
++	@rm cmd...
++	@cat $(SVFILE)
++	@for f in $(XPATHARCHMODULES) $(XPATHSOLIBS) $(XPATHSUBMODULES) $(XPATHHEADERS); do \
++	  if [ ! -f $$f ]; then echo "$$f not build"; exit 1; fi; \
++	done
+ 
+ xasp::
+ 	@echo ""
diff --git a/dev-lang/xsb/files/xsb-3.0.1-perlmatch.patch b/dev-lang/xsb/files/xsb-3.0.1-perlmatch.patch
new file mode 100644
index 000000000000..7ffe9d02d7b4
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-perlmatch.patch
@@ -0,0 +1,19 @@
+--- XSB.orig/packages/perlmatch/cc/xsbpattern.c	2003-04-16 05:16:24.000000000 +1200
++++ XSB/packages/perlmatch/cc/xsbpattern.c	2007-01-26 21:07:57.000000000 +1300
+@@ -39,6 +39,7 @@
+ #include "interface.h"
+ #include "perlpattern.c"          /* pattern match basic functions */   
+ 
++int load_perl__( void );
+ void build_sub_match_spec( void );
+ int is_global_pattern( char *);
+ int global_pattern_mode = FALSE;
+@@ -181,7 +182,7 @@
+   SV *text;    /* Perl representation for the string to be 
+ 		  modified by substitution */ 
+   char *subst_cmd = ptoc_string(2);
+-  int i;                
++
+   
+   /* first load the perl interpreter, if unloaded */
+   if (perlObjectStatus == UNLOADED) load_perl__();
diff --git a/dev-lang/xsb/files/xsb-3.0.1-portage.patch b/dev-lang/xsb/files/xsb-3.0.1-portage.patch
new file mode 100644
index 000000000000..1404def1e396
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-portage.patch
@@ -0,0 +1,94 @@
+--- XSB.orig/build/topMakefile.in	2006-06-25 13:09:42.000000000 +1200
++++ XSB/build/topMakefile.in	2007-01-28 12:01:01.000000000 +1300
+@@ -72,7 +72,7 @@
+ # Everything is placed in subdirectories of this directory.
+ # The values for many of the variables below are expressed
+ # in terms of this one, so you do not need to change them.
+-prefix=@prefix@
++prefix=$(DESTDIR)/usr/lib/xsb
+ 
+ srcdir=@topdir@
+ VPATH=$(srcdir)
+@@ -101,7 +101,7 @@
+ 
+ # Like `prefix', but used for architecture-specific files.
+ src_config_prefix=@arch_config_prefix@
+-install_config_prefix=@arch_install_config_prefix@
++install_config_prefix=$(DESTDIR)@arch_install_config_prefix@
+ # we copy the xsb.o module here
+ install_config_objlibdir=$(install_config_prefix)/saved.o
+ 
+@@ -150,7 +150,7 @@
+ emumake_goal=@emumake_goal@
+ 
+ # Normal user
+-all: prepare emu xsbmod xsbdll gpp remake_dot_O_files register emu_clean
++all: prepare emu xsbmod xsbdll gpp remake_dot_O_files emu_clean
+ 
+ # Developer who just checked out or updated CVS copy
+ devel: prepare emu xsbmod xsbdll gpp remake_dot_O_files emu_clean
+@@ -178,18 +178,11 @@
+ 	@cat $(srcdir)/build/.*.tmp 2> /dev/null | \
+ 			tee -a Installation_summary
+ prepare:
+-	@cd $(src_emudir); \
+-	  rm -f *.o Makefile  2> /dev/null || echo "" ; \
+-	  ln -s ${src_config_objlibdir}/*.o . 2> /dev/null || echo "" ; \
+-	  ln -s ${src_config_prefix}/emuMakefile ./Makefile
+-	@cd $(srcdir)/gpp; \
+-	  rm -f *.o Makefile ; \
+-	  ln -s ${src_config_prefix}/gppMakefile ./Makefile
+-	@rm -f $(srcdir)/build/.*.tmp
++	@mkdir $(src_bindir)
++	@mkdir $(src_config_objlibdir)
+ 
+ emu: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h
+ 	@cd ${src_emudir}; \
+-		make depend; \
+ 		rm -f $(srcdir)/build/.xsb_build_failed; \
+ 		(make EXECUTABLE="$(EXECUTABLE)" $(emumake_goal) || \
+ 			$(srcdir)/build/touch.sh $(srcdir)/build/.xsb_build_failed) \
+@@ -266,7 +259,7 @@
+ 	@./register.sh
+ 
+ 
+-install:: make_directories copy_files configure_packages_install
++install:: make_directories copy_files
+ 
+ make_directories::
+ 	@echo "Verifying that installtion directories exist..."
+@@ -296,11 +289,6 @@
+ 		mkdir -p "${install_scriptdir}" ) && \
+ 		  echo "ok" || \
+ 		(echo "FAILED"; echo "+++Can't create ${install_scriptdir}" >> .missingdirs.tmp)
+-	@echo -n "Directory: ${install_builddir}..."
+-	  @(test -d "${install_builddir}" || \
+-		mkdir -p "${install_builddir}" ) && \
+-		  echo "ok" || \
+-		(echo "FAILED"; echo "+++Can't create ${install_builddir}" >> .missingdirs.tmp)
+ 	@echo -n "Directory: ${install_bindir}..."
+ 	  @(test -d "${install_bindir}" || \
+ 		mkdir -p "${install_bindir}" ) && \
+@@ -357,10 +345,6 @@
+ 		cp -f ${src_scriptdir}/xsb${config_tag} \
+ 				${install_scriptdir}/xsb${config_tag}; \
+ 		chmod 755 ${install_scriptdir}/* ${install_bindir}/* ; \
+-		cp -f ${srcdir}/build/config.sub \
+-		  ${srcdir}/build/config.guess \
+-		  ${prefix}/build; \
+-		chmod 755 ${prefix}/build/* ; \
+ 		echo "Copying config..." ; \
+ 		cp -f ${src_config_libdir}/xsb_configuration.* \
+ 			  ${install_config_libdir} ; \
+@@ -396,11 +380,6 @@
+ 		cp -f ${src_cmplibdir}/*$(xsb_obj_extension) ${install_cmplibdir} ; \
+ 		chmod 644 ${install_cmplibdir}/*$(xsb_obj_extension) ; \
+ 		./copysubdirs.sh ${src_cmplibdir} ${install_cmplibdir} ; \
+-		echo "Copying packages..."; \
+-		cp -f ${src_pkgdir}/*$(xsb_obj_extension) ${install_pkgdir}; \
+-		cp -f ${src_pkgdir}/*.P ${install_pkgdir}; \
+-		./touch.sh ${install_pkgdir}/*$(xsb_obj_extension); \
+-		./copysubdirs.sh ${src_pkgdir} ${install_pkgdir} ; \
+ 		echo "Copying etc..."; \
+ 		cp -fr ${src_etcdir}/* ${install_etcdir}; \
+ 		echo "Copying examples..."; \
diff --git a/dev-lang/xsb/files/xsb-3.0.1-sgml.patch b/dev-lang/xsb/files/xsb-3.0.1-sgml.patch
new file mode 100644
index 000000000000..1ecad966f0c6
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-sgml.patch
@@ -0,0 +1,267 @@
+diff -ur XSB.orig/packages/sgml/cc/fetch_file.c XSB/packages/sgml/cc/fetch_file.c
+--- XSB.orig/packages/sgml/cc/fetch_file.c	2005-03-14 18:43:28.000000000 +1300
++++ XSB/packages/sgml/cc/fetch_file.c	2007-01-26 21:48:07.000000000 +1300
+@@ -336,7 +336,7 @@
+ 
+ 	if( (strstr( *source, "Error 503")!= NULL)
+ 	|| (strstr( *source, "503 Service Unavailable")!=NULL)){
+-	  strstr( *source, "503 Service Unavailable") ;
++	  strcpy( *source, "503 Service Unavailable") ;
+ 	  return FALSE;
+ 	}
+ 
+diff -ur XSB.orig/packages/sgml/cc/parser.c XSB/packages/sgml/cc/parser.c
+--- XSB.orig/packages/sgml/cc/parser.c	2005-03-14 18:43:28.000000000 +1300
++++ XSB/packages/sgml/cc/parser.c	2007-01-26 22:53:38.000000000 +1300
+@@ -593,7 +593,7 @@
+ 		
+ 	for(el = xml_entities; *el; el++)
+ 	  {
+-	    process_entity_declaration(&p, *el);
++	    process_entity_declaration(&p, (const ichar*)*el);
+ 	  }	
+                                                                                
+ 	break;
+@@ -804,15 +804,15 @@
+ 	  m->parent = p->marked;
+ 	  p->marked = m;
+                                                                                
+-	  if ( istrcaseeq(kwd->name, "IGNORE") )
++	  if ( istrcaseeq(kwd->name, (const ichar*)"IGNORE") )
+ 	    m->type = MS_IGNORE;
+-	  else if ( istrcaseeq(kwd->name, "INCLUDE") )
++	  else if ( istrcaseeq(kwd->name, (const ichar*)"INCLUDE") )
+ 	    m->type = MS_INCLUDE;
+-	  else if ( istrcaseeq(kwd->name, "TEMP") )
++	  else if ( istrcaseeq(kwd->name, (const ichar*)"TEMP") )
+ 	    m->type = MS_INCLUDE;
+-	  else if ( istrcaseeq(kwd->name, "CDATA") )
++	  else if ( istrcaseeq(kwd->name, (const ichar*)"CDATA") )
+ 	    m->type = MS_CDATA;
+-	  else if ( istrcaseeq(kwd->name, "RCDATA") )
++	  else if ( istrcaseeq(kwd->name, (const ichar*)"RCDATA") )
+ 	    m->type = MS_RCDATA;
+ 	  else
+ 	    m->type = MS_INCLUDE;           /* default */
+@@ -932,7 +932,7 @@
+ 	      if ( end )
+ 		{ decl = end;
+                                                                                
+-		  if ( istrcaseeq(nm->name, "encoding") )
++		  if ( istrcaseeq(nm->name, (const ichar*)"encoding") )
+ 		    set_encoding(p, buf);
+                                                                                
+ 		  continue;
+@@ -970,9 +970,9 @@
+ { 
+   dtd *dtd = p->dtd;
+                                                                                
+-  if ( istrcaseeq(enc, "iso-8859-1") )
++  if ( istrcaseeq(enc, (const ichar*)"iso-8859-1") )
+     { dtd->encoding = ENC_ISO_LATIN1;
+-    } else if ( istrcaseeq(enc, "utf-8") )
++    } else if ( istrcaseeq(enc, (const ichar*)"utf-8") )
+     { dtd->encoding = ENC_UTF8;
+     } else
+     gripe(ERC_EXISTENCE, "character encoding", enc);
+@@ -1545,7 +1545,7 @@
+ 	if ( f[CF_MDC] == chr )           /* > */
+ 	  { 
+ 	    if ( p->on_decl )
+-	      (*p->on_decl)(p, "");
++	      (*p->on_decl)(p, (const ichar*)"");
+ 	    p->state = S_PCDATA;
+                                                                  
+ 	  } 
+@@ -2131,7 +2131,7 @@
+ 	    { locbuf oldloc;
+         
+ 	      push_location(p, &oldloc);
+-	      set_src_dtd_parser(p, IN_ENTITY, e->name->name);
++	      set_src_dtd_parser(p, IN_ENTITY, (char*)e->name->name);
+ 	      empty_icharbuf(p->buffer);            /* dubious */
+ 	      for(s=text; *s; s++)
+ 		putchar_dtd_parser(p, *s);
+@@ -2907,7 +2907,7 @@
+     
+       if ( !empty )
+ 	{ empty = sgml_calloc(1, sizeof(*empty));
+-	  empty->name = dtd_add_symbol(dtd, "#EMPTY");
++	  empty->name = dtd_add_symbol(dtd, (const ichar*)"#EMPTY");
+ 	  empty->defined = TRUE;
+ 	}
+       
+@@ -4380,7 +4380,7 @@
+       if ( !(s = isee_identifier(dtd, decl, "#default")) )
+ 	{      	return gripe(ERC_SYNTAX_ERROR, "Name expected", decl);
+ 	}
+-      id = dtd_add_symbol(dtd, "#DEFAULT");
++      id = dtd_add_symbol(dtd, (const ichar*)"#DEFAULT");
+       isdef = TRUE;
+     }
+ 
+@@ -4531,7 +4531,7 @@
+ static ichar *
+ baseurl(dtd_parser *p)
+ { if ( p->location.type == IN_FILE && p->location.name )
+-    { return istrdup(p->location.name);
++    { return istrdup((ichar*)p->location.name);
+     }
+  
+   return NULL;
+@@ -4581,7 +4581,7 @@
+ 	    }
+ 	case ET_LITERAL:
+ 	  { e->value = istrdup(val);
+-	    e->length = strlen(e->value);
++	    e->length = strlen((char*)e->value);
+ 	    return decl;
+ 	  }
+ 	default:
+@@ -4652,7 +4652,7 @@
+ 	      
+ 	      if ( !expand_pentities(p, eval, out, len) )
+ 		return FALSE;
+-	      l = strlen(out);                /* could be better */
++	      l = strlen((char*)out);                /* could be better */
+ 	      out += l;
+ 	      len -= l;
+ 	      
+@@ -4794,7 +4794,7 @@
+       {            
+ 	if( e->exturl)
+ 	  {
+-	    file = e->exturl;
++	    file = (char*)e->exturl;
+ 	    	    
+       	    return file;
+ 	  }
+@@ -5932,7 +5932,7 @@
+ 		  a->def  = AT_IMPLIED;
+ 		  add_attribute(dtd, e, a);
+ 
+-		  if ( !e->undefined && !(dtd->dialect != DL_SGML && (istreq("xmlns", nm->name) || istrprefix("xmlns:", nm->name))) )
++		  if ( !e->undefined && !(dtd->dialect != DL_SGML && (istreq("xmlns", nm->name) || istrprefix((const ichar*)"xmlns:", nm->name))) )
+ 		    {	gripe(ERC_NO_ATTRIBUTE, e->name->name, nm->name);				
+ 		    }
+ 		}
+@@ -6444,7 +6444,7 @@
+ 	{ 
+ 	  int chr;
+ 
+-	  in = __utf8_get_char(in, &chr);
++	  in = (const ichar*)__utf8_get_char((const char*)in, &chr);
+ 	  if ( chr >= OUTPUT_CHARSET_SIZE )
+ 	    gripe(ERC_REPRESENTATION, "character");
+ 	  *out++ = chr;
+diff -ur XSB.orig/packages/sgml/cc/sgml2pl.c XSB/packages/sgml/cc/sgml2pl.c
+--- XSB.orig/packages/sgml/cc/sgml2pl.c	2005-03-12 03:57:38.000000000 +1300
++++ XSB/packages/sgml/cc/sgml2pl.c	2007-01-26 22:42:46.000000000 +1300
+@@ -273,7 +273,7 @@
+     {
+       c2p_functor( "dtd_struct", 2, tmp1);
+       c2p_int( (int) d, p2p_arg( tmp1, 1));
+-      c2p_string( d->doctype, p2p_arg( tmp1, 2));
++      c2p_string( (char*)d->doctype, p2p_arg( tmp1, 2));
+     }
+   /* dtd_struct/1 if no doctype is specified */
+   else
+@@ -306,7 +306,7 @@
+     return sgml2pl_error(ERR_TYPE, "atom", doctype);
+ 
+   /*Create the dtd*/
+-  if ( !(dtd=new_dtd(dt)) )
++  if ( !(dtd=new_dtd((const ichar*)dt)) )
+     return FALSE;
+   
+   dtd->references++;
+@@ -474,7 +474,7 @@
+ 
+   if(is_var(doctype) && dtd->doctype)
+     {
+-      c2p_string( dtd->doctype, doctype);	
++      c2p_string( (char*)dtd->doctype, doctype);	
+     }
+   return TRUE;
+ }
+@@ -625,7 +625,7 @@
+ 	    {
+ 	      if( !(s=p2c_string(temp_term) ))
+ 		return FALSE;
+-	      p->enforce_outer_element = dtd_add_symbol(p->dtd, s);
++	      p->enforce_outer_element = dtd_add_symbol(p->dtd, (const ichar*)s);
+ 
+ 	    }
+                          
+@@ -1551,7 +1551,7 @@
+     }
+   else
+     {
+-      c2p_string( nm->name, t);	
++      c2p_string( (char*)nm->name, t);	
+     }
+ }
+ 
+@@ -1577,12 +1577,12 @@
+ {
+   switch(a->definition->type)
+     { case AT_CDATA:
+-	c2p_string( a->value.cdata, t);
++	c2p_string( (char*)a->value.cdata, t);
+ 	break;
+     case AT_NUMBER:
+       {	
+ 	if ( a->value.text )
+-	  c2p_string( a->value.text, t);
++	  c2p_string( (char*)a->value.text, t);
+ 	else
+ 	  c2p_int( a->value.number, t);
+ 	break;
+@@ -1611,7 +1611,7 @@
+ 		head = p2p_car( tail);
+ 		tmp = p2p_cdr( tail);
+ 		tail = tmp;
+-		unify_listval(p, head, a->definition->type, e-val, val);
++		unify_listval(p, head, a->definition->type, e-val, (const char*)val);
+ 	      }
+ 
+ 	    tmp = p2p_new();
+@@ -1623,7 +1623,7 @@
+ 	    head = p2p_car( tail);
+ 	    tmp = p2p_cdr( tail);
+ 	    tail = tmp;
+-	    unify_listval(p, head, a->definition->type, e-val, val);
++	    unify_listval(p, head, a->definition->type, e-val, (const char*)val);
+ 
+ 	    c2p_nil( tmp);
+ 	    p2p_unify( tmp, tail);
+@@ -1694,7 +1694,7 @@
+ 	    {
+ 			
+ 	      c2p_functor( "entity", 1 , tmp2);
+-	      c2p_string( e->name->name, p2p_arg( tmp2, 1));
++	      c2p_string( (char*)e->name->name, p2p_arg( tmp2, 1));
+ 	      p2p_unify( h, tmp2);
+ 
+ 	    }
+@@ -1892,7 +1892,7 @@
+ 
+     }
+   else
+-    c2p_string ( e->name->name, t);
++    c2p_string ( (char*)e->name->name, t);
+ 
+   return;
+ }
+diff -ur XSB.orig/packages/sgml/cc/xmlns.c XSB/packages/sgml/cc/xmlns.c
+--- XSB.orig/packages/sgml/cc/xmlns.c	2005-03-08 09:31:23.000000000 +1300
++++ XSB/packages/sgml/cc/xmlns.c	2007-01-26 22:38:20.000000000 +1300
+@@ -156,7 +156,7 @@
+ 	  *local = s+1;
+ 	  n = dtd_add_symbol(dtd, buf);
+ 
+-	  if ( istrprefix("xml", buf) )	/* XML reserved namespaces */
++	  if ( istrprefix((const ichar*)"xml", buf) )	/* XML reserved namespaces */
+ 	    { *url = n->name;
+ 	      return TRUE;
+ 	    } else if ( (ns = xmlns_find(p->environments, n)) )
diff --git a/dev-lang/xsb/files/xsb-3.0.1-slx.patch b/dev-lang/xsb/files/xsb-3.0.1-slx.patch
new file mode 100644
index 000000000000..85bd026ffa1d
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-slx.patch
@@ -0,0 +1,20 @@
+--- XSB.orig/packages/slx/Makefile	2002-03-15 21:09:39.000000000 +1300
++++ XSB/packages/slx/Makefile	2007-01-23 20:38:53.000000000 +1300
+@@ -27,7 +27,7 @@
+ 
+ ALL = 	slxshell${OBJEXT}
+ 
+-Option = [optimize]
++Option = [optimize,quit_on_error]
+ 
+ #-----------------------------------------------------------------------#
+ #
+@@ -39,7 +39,7 @@
+ #-----------------------------------------------------------------------#
+ 
+ # continue to the next when one error occurs
+-.IGNORE:
++#.IGNORE:
+ 
+ # suffix rules
+ .SUFFIXES: .P ${OBJEXT} .H
diff --git a/dev-lang/xsb/files/xsb-3.0.1-wildmatch.patch b/dev-lang/xsb/files/xsb-3.0.1-wildmatch.patch
new file mode 100644
index 000000000000..383b27116767
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-wildmatch.patch
@@ -0,0 +1,15 @@
+--- XSB.orig/packages/wildmatch/cc/xsb_wildmatch.c	2005-03-05 20:52:21.000000000 +1300
++++ XSB/packages/wildmatch/cc/xsb_wildmatch.c	2007-01-24 22:07:11.000000000 +1300
+@@ -114,12 +114,6 @@
+   return FALSE;
+ }
+ 
+-#ifndef GLOB_ABORTED
+-#define	GLOB_ABORTED	(-2)	/* Unignored error. */
+-#endif
+-#define	GLOB_NOMATCH	(-3)	/* No match and GLOB_NOCHECK not set. */
+-#define	GLOB_NOSYS	(-4)	/* Function not supported. */
+-#define GLOB_ABEND	GLOB_ABORTED
+ 
+ 
+ /* XSB glob matcher: match files in current directory according to a wildcard.
diff --git a/dev-lang/xsb/files/xsb-3.0.1-xpath.patch b/dev-lang/xsb/files/xsb-3.0.1-xpath.patch
new file mode 100644
index 000000000000..5bd586c1a039
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-xpath.patch
@@ -0,0 +1,69 @@
+diff -ur XSB.orig/packages/xpath/cc/xpathparser.c XSB/packages/xpath/cc/xpathparser.c
+--- XSB.orig/packages/xpath/cc/xpathparser.c	2005-03-04 07:37:19.000000000 +1300
++++ XSB/packages/xpath/cc/xpathparser.c	2007-01-27 12:03:02.000000000 +1300
+@@ -157,7 +157,7 @@
+       namespace = p2c_string( ns_term);
+     }
+   /*This is the function which evaluates the xpath expression on xml input*/
+-  ret = execute_xpath_expression( source, xpath_expr, namespace, output_term, flag);
++  ret = execute_xpath_expression( source, (xmlChar*)xpath_expr, (xmlChar*)namespace, output_term, flag);
+   if( ret == FALSE){
+     return xpath_error(ERR_MISC, "xpath", "Unable to parse the xpath expression");
+   }
+@@ -230,7 +230,7 @@
+   for( i = 0; i < size; i++){
+     buf[i]=xmlBufferCreate();
+     xmlNodeDump( buf[i], doc, xpathObj->nodesetval->nodeTab[i],0,0);
+-    bufsize+=strlen(buf[i]->content); 
++    bufsize+=strlen((char*)buf[i]->content); 
+   }
+ 
+   output_buffer = malloc( bufsize);
+@@ -240,8 +240,8 @@
+ 
+   ptr = output_buffer;
+   for(j=0;j<i;j++){
+-    strcpy( ptr, buf[j]->content);
+-    ptr+=strlen(buf[j]->content);
++    strcpy( ptr, (char*)buf[j]->content);
++    ptr+=strlen((char*)buf[j]->content);
+   }
+   *ptr='\0';
+ 
+diff -ur XSB.orig/packages/xpath/configure XSB/packages/xpath/configure
+--- XSB.orig/packages/xpath/configure	2005-03-06 13:29:02.000000000 +1300
++++ XSB/packages/xpath/configure	2007-01-27 11:34:56.000000000 +1300
+@@ -550,10 +550,10 @@
+ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+ 
+ 
+-echo '
+-- You did not tell me what kind of host system you want to configure.
+-- I will attempt to guess the kind of system this is.
+-' 1>&6
++#echo '
++#- You did not tell me what kind of host system you want to configure.
++#- I will attempt to guess the kind of system this is.
++#' 1>&6
+ 
+ # Make sure we can run config.sub.
+ if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+@@ -592,6 +592,7 @@
+ ccflags=
+ ldflags=
+ 
++if test false ; then
+ case "$canonical" in
+      *-cygwin*)
+         pkg_src_dir=$build_dir/cc
+@@ -614,6 +615,10 @@
+ 	ldflags="`sh $xpath_config_prog $exec_prefix_option $prefix_option --libs`"
+ 	;;
+ esac
++fi
++
++xmllib_ccflags=`xml2-config --cflags`
++ldflags=`xml2-config --libs`
+ 
+ ccflags="$xmllib_ccflags"	
+ if test  "$xmllib_ccflags" != "ERROR" && test "$ldflags" != "ERROR"  ; then
diff --git a/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch b/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch
new file mode 100644
index 000000000000..7bffa83f40e8
--- /dev/null
+++ b/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch
@@ -0,0 +1,30 @@
+--- XSB.orig/build/xsb.in	2005-01-15 07:30:43.000000000 +1300
++++ XSB/build/xsb.in	2007-01-28 22:08:36.000000000 +1300
+@@ -72,9 +72,9 @@
+ scriptdir=`dirname $thisfile`
+ topdir=`dirname $scriptdir`
+ 
+-config=`$topdir/build/config.guess`
+-canonical=`$topdir/build/config.sub $config`
+-exec_dir=$topdir/config/${canonical}${suffix}
++#config=`$topdir/build/config.guess`
++#canonical=`$topdir/build/config.sub $config`
++exec_dir=$topdir/config/@full_config_name@
+ executable=${exec_dir}/bin/xsb
+ 
+ # The purpose of this complex thing is to make sure that arguments
+@@ -101,12 +101,12 @@
+    echo "       file doesn't exist or is not executable"
+    echo ""
+    echo "XSB might not have have been compiled for the following machine configuration:"
+-   echo "             " ${canonical}${suffix}
++   echo "             " @full_config_name@
+    echo "***This installation seems to have the following configurations available:"
+    # First drop files that don't have "-".
+    # Then drop the configuration that we just said doesn't exist.
+    ls -1  $topdir/config | egrep "-" \
+-    	    	    	    | egrep -v "^${canonical}${suffix}\$" 2> /dev/null
++    	    	    	    | egrep -v "^@full_config_name@\$" 2> /dev/null
+    echo "***configuration list end"
+    echo ""
+    echo "One other frequent problem: you might be over your disk quota,"