diff options
author | Keri Harris <keri@gentoo.org> | 2010-11-01 05:39:35 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2010-11-01 05:39:35 +0000 |
commit | 3f81003339caa2a5065ba9b18f4d910013d0b1cc (patch) | |
tree | 4fd5d230a74e758ca2a63f4fa5344ac5b3631715 /dev-lang | |
parent | Bump to 1.5 for the r5 version. Fix HOMEPAGE to be version-independent as well. (diff) | |
download | gentoo-2-3f81003339caa2a5065ba9b18f4d910013d0b1cc.tar.gz gentoo-2-3f81003339caa2a5065ba9b18f4d910013d0b1cc.tar.bz2 gentoo-2-3f81003339caa2a5065ba9b18f4d910013d0b1cc.zip |
Remove old versions
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
21 files changed, 13 insertions, 2065 deletions
diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog index e3ed455b2a30..c74395048b0b 100644 --- a/dev-lang/xsb/ChangeLog +++ b/dev-lang/xsb/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for dev-lang/xsb # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.26 2010/10/31 19:41:11 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.27 2010/11/01 05:39:35 keri Exp $ + + 01 Nov 2010; <keri@gentoo.org> -xsb-3.0.1.ebuild, + -files/xsb-3.0.1-chr_d.patch, -files/xsb-3.0.1-configure.patch, + -files/xsb-3.0.1-debug.patch, -files/xsb-3.0.1-gap.patch, + -files/xsb-3.0.1-justify.patch, -files/xsb-3.0.1-libwww.patch, + -files/xsb-3.0.1-mysql.patch, -files/xsb-3.0.1-nostrip.patch, + -files/xsb-3.0.1-odbc.patch, -files/xsb-3.0.1-packages.patch, + -files/xsb-3.0.1-perlmatch.patch, -files/xsb-3.0.1-portage.patch, + -files/xsb-3.0.1-sgml.patch, -files/xsb-3.0.1-slx.patch, + -files/xsb-3.0.1-wildmatch.patch, -files/xsb-3.0.1-xpath.patch, + -files/xsb-3.0.1-xsb-script.patch, -xsb-3.1.ebuild, -xsb-3.2.ebuild: + Remove old versions 31 Oct 2010; Markos Chandras <hwoarang@gentoo.org> xsb-3.2-r1.ebuild: Stable on amd64 wrt bug #341963 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 deleted file mode 100644 index 0506e87032c2..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-chr_d.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index 7c917582e6fb..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-configure.patch +++ /dev/null @@ -1,271 +0,0 @@ ---- XSB.orig/build/configure.in 2006-06-25 13:08:48.000000000 +1200 -+++ XSB/build/configure.in 2007-02-08 21:01:15.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 -@@ -986,7 +986,7 @@ - ODBCSRC="" - ODBCOBJ="" - --if test "${with_odbc+set}" = "set"; then -+if test "${with_odbc}" = "yes"; then - if test -n "$with_os" ; then - echo -n "" - # AC_DEFINE(XSB_ODBC) -@@ -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}" -@@ -1039,9 +1039,9 @@ - fi - fi - --if test "${with_odbc+set}" = "set"; then -+if test "${with_odbc}" = "yes"; then - AC_DEFINE(XSB_ODBC) -- with_odbc=yes -+# with_odbc=yes - fi - - INTERPROLOGSRC="" -@@ -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="" -@@ -1175,14 +1178,14 @@ - if test "${enable_profile}" = "yes"; then - AC_DEFINE(DEBUG) - AC_DEFINE(PROFILE) -- do_debugging=yes -+# do_debugging=yes - fi - - if test "${enable_debug}" = "yes"; then - AC_DEFINE(NON_OPT_COMPILE) - AC_DEFINE(DEBUG) - dnl AC_DEFINE(CP_DEBUG) -- do_debugging=yes -+# do_debugging=yes - fi - - if test "${enable_debug_verbose}" = "yes"; then -@@ -1547,20 +1550,22 @@ - #fi - - # dnl ODBC library --if test "${with_odbc}" = yes ; then -+#if test "${with_odbc}" = yes ; then - case "$canonical" in - *-cygwin*) LDFLAGS="-lodbc32 ${LDFLAGS}" - LINKFLAGS="-lodbc32 ${LINKFLAGS}" - ;; -- *) if test -n "${with_iodbc}"; then -- LDFLAGS="-liodbc ${LDFLAGS}" -- LINKFLAGS="-liodbc ${LINKFLAGS}" -- else -- LDFLAGS="-lodbc ${LDFLAGS}" -- LINKFLAGS="-lodbc ${LINKFLAGS}" -+ *) if test "${with_iodbc}" = "yes"; then -+ ODBC_CFLAGS="$(iodbc-config --cflags)" -+ LDFLAGS="$(iodbc-config --libs) ${LDFLAGS}" -+# LINKFLAGS="-liodbc ${LINKFLAGS}" -+ elif test "${with_odbc}" = "yes"; then -+ ODBC_CFLAGS="$(odbc_config --cflags)" -+ LDFLAGS="$(odbc_config --libs) ${LDFLAGS}" -+# LINKFLAGS="-lodbc ${LINKFLAGS}" - fi - esac --fi -+#fi - - # this is needed for -mno-cygwin dll compilation - DLLTYPE=nodll -@@ -1696,6 +1701,7 @@ - - AC_SUBST(ODBCSRC) - AC_SUBST(ODBCOBJ) -+AC_SUBST(ODBC_CFLAGS) - AC_SUBST(INTERPROLOGSRC) - AC_SUBST(INTERPROLOGOBJ) - AC_SUBST(mno_cyg_inclib) -@@ -1726,11 +1732,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 +1860,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 +1910,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-debug.patch b/dev-lang/xsb/files/xsb-3.0.1-debug.patch deleted file mode 100644 index c0c38ffc9a60..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-debug.patch +++ /dev/null @@ -1,123 +0,0 @@ ---- XSB.orig/emu/biassert.c 2006-07-26 02:18:41.000000000 +1200 -+++ XSB/emu/biassert.c 2007-02-03 13:42:01.000000000 +1300 -@@ -2783,16 +2783,16 @@ - /* remove it from index chains */ - for( i = NI; i >= 1; i-- ) { - IP = ClRefIndPtr(Clause, i); -- if (cell_opcode(IP) == dynnoop) /* deleting last in bucket */ -+ if (cell_opcode(IP) == dynnoop) { /* deleting last in bucket */ - sob = (SOBRef)IndRefNext(IP); /* so get SOB addr */ -+ xsb_dbgmsg((LOG_RETRACT, -+ "SOB(%d) - hash size %d - %d clauses", -+ i, ClRefHashSize(sob), ClRefNumNonemptyBuckets(sob) )); -+ xsb_dbgmsg((LOG_RETRACT, -+ "Addr %p : prev %p : next %p", -+ sob, ClRefNext(sob), ClRefPrev(sob) )); -+ } - else sob = NULL; -- -- xsb_dbgmsg((LOG_RETRACT, -- "SOB(%d) - hash size %d - %d clauses", -- i, ClRefHashSize(sob), ClRefNumNonemptyBuckets(sob) )); -- xsb_dbgmsg((LOG_RETRACT, -- "Addr %p : prev %p : next %p", -- sob, ClRefNext(sob), ClRefPrev(sob) )); - delete_from_hashchain(Clause,i,NI) ; - if (sob && --ClRefNumNonemptyBuckets(sob) == 0) - { /* if emptied bucket, decrement count; if all empty, reclaim SOB */ ---- XSB.orig/emu/complete_local.h 2005-11-18 12:24:24.000000000 +1300 -+++ XSB/emu/complete_local.h 2007-01-30 21:24:09.000000000 +1300 -@@ -144,7 +144,7 @@ - - if (tcp_ptcp(subg_cp_ptr(prof_compl_subg)) != NULL ) { - print_sdg_edge(sdg_check_num,2, -- tcp_ptcp(subg_cp_ptr(prof_compl_subg)), -+ (VariantSF)tcp_ptcp(subg_cp_ptr(prof_compl_subg)), - prof_compl_subg); - } else { - } -@@ -152,7 +152,7 @@ - nsf = subg_asf_list_ptr(prof_compl_subg); - while (nsf != NULL) { - -- print_sdg_edge(sdg_check_num,1,nlcp_ptcp(nsf),prof_compl_subg); -+ print_sdg_edge(sdg_check_num,1,(VariantSF)nlcp_ptcp(nsf),prof_compl_subg); - - nsf = nlcp_prevlookup(nsf); - } -@@ -160,7 +160,7 @@ - nsf = subg_compl_susp_ptr(prof_compl_subg); - while (nsf != NULL) { - -- print_sdg_edge(sdg_check_num,-1,csf_ptcp(nsf),prof_compl_subg); -+ print_sdg_edge(sdg_check_num,-1,(VariantSF)csf_ptcp(nsf),prof_compl_subg); - - nsf = csf_prevcsf(nsf); - } ---- XSB.orig/emu/debug_xsb.c 2006-07-15 04:49:36.000000000 +1200 -+++ XSB/emu/debug_xsb.c 2007-01-30 21:20:41.000000000 +1300 -@@ -283,7 +283,7 @@ - fprintf(where,"choicepoint(address(%p),unknown_psc).\n", cpf); - } - --#endif CP_DEBUG -+#endif /* CP_DEBUG */ - - /*-------------------------------------------*/ - -@@ -423,7 +423,7 @@ - alt_printnum++ ; - where = fopen(buf,"w") ; - if (! where) -- { xsb_dbgmsg((LOG_GC, "could not open CP%d", printnum)); -+ { xsb_dbgmsg((LOG_GC, "could not open CP%d", alt_printnum)); - return; - } - -@@ -741,6 +741,22 @@ - } - } - -+/* -+ * Tries to make the interface more robust by cleaning-up any extra user -+ * input supplied to a prompt. Place a call to this function after any -+ * input scan which doesn't take the whole input line (ie. which isn't a -+ * `scanf("%s", &array);'). -+ */ -+static void skip_to_nl(void) -+{ -+ char c; -+ -+ do { -+ c = getchar(); -+ } while (c != '\n'); -+} -+ -+ - void print_tables(void) - { - int i = 0; -@@ -886,23 +902,6 @@ - fprintf(stddbg, "\n"); - } - --/*--------------------------------------------------------------------------*/ -- --/* -- * Tries to make the interface more robust by cleaning-up any extra user -- * input supplied to a prompt. Place a call to this function after any -- * input scan which doesn't take the whole input line (ie. which isn't a -- * `scanf("%s", &array);'). -- */ --static void skip_to_nl(void) --{ -- char c; -- -- do { -- c = getchar(); -- } while (c != '\n'); --} -- - /*----- For table debugging --------------------------------------------*/ - - static char *compl_stk_frame_field[] = { diff --git a/dev-lang/xsb/files/xsb-3.0.1-gap.patch b/dev-lang/xsb/files/xsb-3.0.1-gap.patch deleted file mode 100644 index 245e5f0b1e51..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-gap.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 20a9143a5318..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-justify.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index 478df6b2115e..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-libwww.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 deleted file mode 100644 index 9b12014b2da6..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-mysql.patch +++ /dev/null @@ -1,90 +0,0 @@ -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 deleted file mode 100644 index 0d601c4d9f0e..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-nostrip.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index c091e0013298..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-odbc.patch +++ /dev/null @@ -1,81 +0,0 @@ -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 deleted file mode 100644 index a8e3fd28af6c..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-packages.patch +++ /dev/null @@ -1,173 +0,0 @@ ---- 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 deleted file mode 100644 index 7ffe9d02d7b4..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-perlmatch.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index e96a87b89ae1..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-portage.patch +++ /dev/null @@ -1,189 +0,0 @@ ---- XSB.orig/build/emuMakefile.in 2006-06-25 13:09:42.000000000 +1200 -+++ XSB/build/emuMakefile.in 2007-02-08 20:57:51.000000000 +1300 -@@ -42,6 +42,7 @@ - LDFLAGS=@LDFLAGS@ - ODBCSRC=@ODBCSRC@ - ODBCOBJ=@ODBCOBJ@ -+ODBC_CFLAGS=@ODBC_CFLAGS@ - INTERPROLOGSRC=@INTERPROLOGSRC@ - INTERPROLOGOBJ=@INTERPROLOGOBJ@ - DLLTYPE=@DLLTYPE@ -@@ -239,26 +240,31 @@ - @cp dynload.o $(arch_config_objlibdir) 2> /dev/null || echo "" - - emuloop.o: emuloop.c -- @echo -e "\t[$(CC)] emuloop.c using $(emuloopCFLAGS)" -+ @echo -e "\t[$(CC)] emuloop.c" - @$(CC) -I$(arch_config_prefix) -c $(emuloopCFLAGS) emuloop.c - @cp emuloop.o $(arch_config_objlibdir) 2> /dev/null || echo "" - - # Higher optimization level has problem with some versions of gcc - tr_utils.o: tr_utils.c -- @echo -e "\t[$(CC)] tr_utils.c using $(trutilsCFLAGS)" -+ @echo -e "\t[$(CC)] tr_utils.c" - @$(CC) -I$(arch_config_prefix) -c $(trutilsCFLAGS) tr_utils.c - @cp tr_utils.o $(arch_config_objlibdir) 2> /dev/null || echo "" - - builtin.o: builtin.c -- @echo -e "\t[$(CC)] builtin.c using $(builtinsCFLAGS)" -+ @echo -e "\t[$(CC)] builtin.c" - @$(CC) -I$(arch_config_prefix) -c $(builtinsCFLAGS) builtin.c - @cp builtin.o $(arch_config_objlibdir) 2> /dev/null || echo "" - - loader_xsb.o: loader_xsb.c -- @echo -e "\t[$(CC)] loader_xsb.c using $(loaderCFLAGS)" -+ @echo -e "\t[$(CC)] loader_xsb.c" - @$(CC) -I$(arch_config_prefix) -c $(loaderCFLAGS) loader_xsb.c - @cp loader_xsb.o $(arch_config_objlibdir) 2> /dev/null || echo "" - -+odbc_xsb.o: odbc_xsb.c -+ @echo -e "\t[$(CC)] odbc_xsb.c" -+ @$(CC) -I$(arch_config_prefix) -c $(ODBC_CFLAGS) $(CFLAGS) odbc_xsb.c -+ @cp odbc_xsb.o $(arch_config_objlibdir) 2> /dev/null || echo "" -+ - .c.o: - @echo -e "\t[$(CC)] $*.c" - @$(CC) -I$(arch_config_prefix) -c $(CFLAGS) $*.c ---- XSB.orig/build/topMakefile.in 2006-06-25 13:09:42.000000000 +1200 -+++ XSB/build/topMakefile.in 2007-02-03 14:02:29.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 gpp remake_dot_O_files - - # Developer who just checked out or updated CVS copy - devel: prepare emu xsbmod xsbdll gpp remake_dot_O_files emu_clean -@@ -178,28 +178,21 @@ - @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 -+ @(test -d $(src_bindir) || mkdir $(src_bindir)) -+ @(test -d $(src_config_objlibdir) || mkdir $(src_config_objlibdir)) - --emu: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h -+emu: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h prepare - @cd ${src_emudir}; \ -- make depend; \ - rm -f $(srcdir)/build/.xsb_build_failed; \ -- (make EXECUTABLE="$(EXECUTABLE)" $(emumake_goal) || \ -+ ($(MAKE) EXECUTABLE="$(EXECUTABLE)" $(emumake_goal) || \ - $(srcdir)/build/touch.sh $(srcdir)/build/.xsb_build_failed) \ - 2>&1 | tee -a ../build/Installation_summary; \ - (test ! -f $(srcdir)/build/.xsb_build_failed || \ - (rm -f $(srcdir)/build/.xsb_build_failed; exit 1)) - --gpp: -+gpp: xsbmod - @echo ""; echo "Making gpp" -- @cd $(srcdir)/gpp; make 2>&1 | tee -a ../build/Installation_summary -+ @cd $(srcdir)/gpp; $(MAKE) 2>&1 | tee -a ../build/Installation_summary - - # Compiling the interface with SMODELS. - xasp: -@@ -220,9 +213,9 @@ - - # if supporting Oracle, then emumake_goal=xsbora; else emumake_goal=xsb - # This invokes xsboramod and xsbmod goals in emuMakefile, respectively --xsbmod: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h -+xsbmod: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h emu - @cd ${src_emudir}; \ -- make $(emumake_goal)mod -+ $(MAKE) $(emumake_goal)mod - - xsbdynmod: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h - @cd ${src_emudir}; \ -@@ -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}" ) && \ -@@ -331,11 +319,6 @@ - mkdir -p "${install_pkgxmcdir}" ) && \ - echo "ok" || \ - (echo "FAILED"; echo "+++Can't create ${install_pkgxmcdir}" >> .missingdirs.tmp) -- @echo -n "Directory: ${install_examples}..." -- @(test -d "${install_examples}" || \ -- mkdir -p "${install_examples}" ) && \ -- echo "ok" || \ -- (echo "FAILED"; echo "+++Can't create ${install_examples}" >> .missingdirs.tmp) - @echo -n "Directory: ${install_prolog_includes}..." - @(test -d "${install_prolog_includes}" || \ - mkdir -p "${install_prolog_includes}" ) && \ -@@ -357,10 +340,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 +375,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..."; \ -@@ -416,8 +390,8 @@ - @./pkg_config.sh $(install_scriptdir)/xsb$(config_tag) ; \ - chmod 644 $(install_config_libdir)/xsb_configuration$(xsb_obj_extension) - --remake_dot_O_files: -- @cd $(srcdir); make XSB=$(src_scriptdir)/xsb$(config_tag) -+remake_dot_O_files: gpp -+ @cd $(srcdir); $(MAKE) XSB=$(src_scriptdir)/xsb$(config_tag) - - remake_dot_O_files_force: - @cd $(srcdir); make force XSB=$(src_scriptdir)/xsb$(config_tag) diff --git a/dev-lang/xsb/files/xsb-3.0.1-sgml.patch b/dev-lang/xsb/files/xsb-3.0.1-sgml.patch deleted file mode 100644 index 1ecad966f0c6..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-sgml.patch +++ /dev/null @@ -1,267 +0,0 @@ -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 deleted file mode 100644 index 85bd026ffa1d..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-slx.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index 383b27116767..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-wildmatch.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 deleted file mode 100644 index 5bd586c1a039..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-xpath.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 deleted file mode 100644 index bf9a3250e661..000000000000 --- a/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- XSB.orig/build/xsb.in 2005-01-15 07:30:43.000000000 +1300 -+++ XSB/build/xsb.in 2007-01-29 20:53:13.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 -@@ -95,18 +95,18 @@ - fi - - if test -x "$executable" ; then -- eval "exec @CROSS_SIMULATOR@ $executable $xsb_cmd" -+ LD_LIBRARY_PATH=${exec_dir}/lib eval "exec @CROSS_SIMULATOR@ $executable $xsb_cmd" - else - echo "${executable}: " - 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," diff --git a/dev-lang/xsb/xsb-3.0.1.ebuild b/dev-lang/xsb/xsb-3.0.1.ebuild deleted file mode 100644 index 29f3d9ef6c36..000000000000 --- a/dev-lang/xsb/xsb-3.0.1.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.0.1.ebuild,v 1.6 2009/02/28 21:45:39 keri Exp $ - -MY_PN="XSB" -MY_P="${MY_PN}-${PV}" - -inherit eutils autotools java-pkg-opt-2 - -DESCRIPTION="XSB is a logic programming and deductive database system" -HOMEPAGE="http://xsb.sourceforge.net" -SRC_URI="mirror://sourceforge/xsb/xsb-3.0.1-src.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="debug iodbc java libwww mysql odbc perl threads xml" - -RDEPEND="iodbc? ( dev-db/libiodbc ) - java? ( virtual/jdk ) - libwww? ( net-libs/libwww ) - mysql? ( virtual/mysql ) - odbc? ( dev-db/unixODBC ) - perl? ( dev-lang/perl ) - xml? ( dev-libs/libxml2 )" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_PN} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-configure.patch - epatch "${FILESDIR}"/${P}-portage.patch - epatch "${FILESDIR}"/${P}-packages.patch - epatch "${FILESDIR}"/${P}-chr_d.patch - epatch "${FILESDIR}"/${P}-gap.patch - epatch "${FILESDIR}"/${P}-justify.patch - epatch "${FILESDIR}"/${P}-libwww.patch - epatch "${FILESDIR}"/${P}-mysql.patch - epatch "${FILESDIR}"/${P}-odbc.patch - epatch "${FILESDIR}"/${P}-perlmatch.patch - epatch "${FILESDIR}"/${P}-sgml.patch - epatch "${FILESDIR}"/${P}-wildmatch.patch - epatch "${FILESDIR}"/${P}-xpath.patch - epatch "${FILESDIR}"/${P}-xsb-script.patch - epatch "${FILESDIR}"/${P}-nostrip.patch - epatch "${FILESDIR}"/${P}-debug.patch - - cd "${S}"/build - eautoconf -} - -src_compile() { - cd "${S}"/build - - einfo "Building xsb compiler" - econf \ - --disable-optimization \ - --without-smodels \ - $(use_with threads mt) \ - $(use_with perl) \ - $(use_with odbc) \ - $(use_with iodbc) \ - $(use_enable java interprolog) \ - $(use_enable debug) \ - $(use_enable debug debug-verbose) \ - $(use_enable debug profile) \ - || die "econf failed" - emake -j1 || die "emake failed" - - einfo "Building xsb packages" - - if use libwww ; then - cd "${S}"/packages/libwww - econf --with-libwww=/usr || die "econf libwww package failed" - fi - - if use mysql ; then - cd "${S}"/packages/dbdrivers/mysql - econf || die "econf mysql package failed" - fi - - if use odbc ; then - cd "${S}"/packages/dbdrivers/odbc - econf || die "econf odbc package failed" - fi - - if use xml ; then - cd "${S}"/packages/xpath - econf || die "econf xpath package failed" - fi - - cd "${S}"/packages - emake -j1 || die "emake packages failed" - - if use libwww ; then - emake -j1 libwww || die "emake libwww package failed" - fi - - if use mysql ; then - emake -j1 mysql || die "emake mysql package failed" - fi - - if use odbc ; then - emake -j1 odbc || die "emake odbc package failed" - fi - - if use perl ; then - emake -j1 perlmatch || die "emake perlmatch package failed" - fi - - if use xml ; then - emake -j1 xpath || die "emake xpath package failed" - fi -} - -src_install() { - cd "${S}"/build - make DESTDIR="${D}" install || die - - dosym /usr/lib/xsb/bin/xsb /usr/bin/xsb - - cd "${S}"/packages - local PACKAGES=/usr/lib/xsb/packages - insinto ${PACKAGES} - doins *.xwam - - insinto ${PACKAGES}/chr - doins chr/*.xwam - - insinto ${PACKAGES}/chr_d - doins chr_d/*.xwam - - insinto ${PACKAGES}/gap - doins gap/*.xwam - - insinto ${PACKAGES}/justify - doins justify/*.xwam - doins justify/*.H - - insinto ${PACKAGES}/regmatch - doins regmatch/*.xwam - insinto ${PACKAGES}/regmatch/cc - doins regmatch/cc/*.H - - insinto ${PACKAGES}/sgml - doins sgml/*.xwam - insinto ${PACKAGES}/sgml/cc - doins sgml/cc/*.H - insinto ${PACKAGES}/sgml/cc/dtd - doins sgml/cc/dtd/* - - insinto ${PACKAGES}/slx - doins slx/*.xwam - - insinto ${PACKAGES}/wildmatch - doins wildmatch/*.xwam - insinto ${PACKAGES}/wildmatch/cc - doins wildmatch/cc/*.H - - if use libwww ; then - insinto ${PACKAGES}/libwww - doins libwww/*.xwam - insinto ${PACKAGES}/libwww/cc - doins libwww/cc/*.H - fi - - if use mysql || use odbc ; then - insinto ${PACKAGES}/dbdrivers - doins dbdrivers/*.xwam - doins dbdrivers/*.H - insinto ${PACKAGES}/dbdrivers/cc - doins dbdrivers/cc/*.H - if use mysql ; then - insinto ${PACKAGES}/dbdrivers/mysql - doins dbdrivers/mysql/*.xwam - insinto ${PACKAGES}/dbdrivers/mysql/cc - doins dbdrivers/mysql/cc/*.H - fi - if use odbc ; then - insinto ${PACKAGES}/dbdrivers/odbc - doins dbdrivers/odbc/*.xwam - insinto ${PACKAGES}/dbdrivers/odbc/cc - doins dbdrivers/odbc/cc/*.H - fi - fi - - if use perl ; then - insinto ${PACKAGES}/perlmatch - doins perlmatch/*.xwam - insinto ${PACKAGES}/perlmatch/cc - doins perlmatch/cc/*.H - fi - - if use xml ; then - insinto ${PACKAGES}/xpath - doins xpath/*xwam - insinto ${PACKAGES}/xpath/cc - doins xpath/cc/*.H - fi - - cd "${S}" - dodoc FAQ README -} diff --git a/dev-lang/xsb/xsb-3.1.ebuild b/dev-lang/xsb/xsb-3.1.ebuild deleted file mode 100644 index 2b652ad56509..000000000000 --- a/dev-lang/xsb/xsb-3.1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.1.ebuild,v 1.6 2009/02/28 21:45:39 keri Exp $ - -MY_PN="XSB" -MY_P="${MY_PN}-unix" - -PATCHSET_VER="0" - -inherit eutils autotools java-pkg-opt-2 - -DESCRIPTION="XSB is a logic programming and deductive database system" -HOMEPAGE="http://xsb.sourceforge.net" -SRC_URI="mirror://sourceforge/xsb/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="debug iodbc java libwww mysql odbc perl threads xml" - -RDEPEND="iodbc? ( dev-db/libiodbc ) - java? ( >=virtual/jdk-1.4 ) - libwww? ( net-libs/libwww ) - mysql? ( virtual/mysql ) - odbc? ( dev-db/unixODBC ) - perl? ( dev-lang/perl ) - xml? ( dev-libs/libxml2 )" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_PN} - -src_unpack() { - unpack ${A} - cd "${S}" - - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV} - - cd "${S}"/build - eautoconf -} - -src_compile() { - cd "${S}"/build - - einfo "Building xsb compiler" - econf \ - --disable-optimization \ - --without-smodels \ - --with-config-tag="" \ - $(use_with java interprolog) \ - $(use_with odbc) \ - $(use_with iodbc) \ - $(use_enable threads mt) \ - $(use_enable debug) \ - $(use_enable debug debug-verbose) \ - $(use_enable debug profile) \ - || die "econf failed" - emake -j1 || die "emake failed" - - einfo "Building xsb packages" - - if use libwww ; then - cd "${S}"/packages/libwww - econf --with-libwww=/usr || die "econf libwww package failed" - fi - - if use mysql ; then - cd "${S}"/packages/dbdrivers/mysql - econf || die "econf mysql package failed" - fi - - if use odbc ; then - cd "${S}"/packages/dbdrivers/odbc - econf || die "econf odbc package failed" - fi - - if use xml ; then - cd "${S}"/packages/xpath - econf || die "econf xpath package failed" - fi - - cd "${S}"/packages - rm -rf *.xwam - emake -j1 || die "emake packages failed" - - if use libwww ; then - emake -j1 libwww || die "emake libwww package failed" - fi - - if use mysql ; then - emake -j1 mysql || die "emake mysql package failed" - fi - - if use odbc ; then - emake -j1 odbc || die "emake odbc package failed" - fi - - if use perl ; then - emake -j1 perlmatch || die "emake perlmatch package failed" - fi - - if use xml ; then - emake -j1 xpath || die "emake xpath package failed" - fi -} - -src_install() { - cd "${S}"/build - make DESTDIR="${D}" install || die - - dosym /usr/lib/xsb/bin/xsb /usr/bin/xsb - - cd "${S}"/packages - local PACKAGES=/usr/lib/xsb/packages - insinto ${PACKAGES} - doins *.xwam - - insinto ${PACKAGES}/chr - doins chr/*.xwam - - insinto ${PACKAGES}/chr_d - doins chr_d/*.xwam - - insinto ${PACKAGES}/gap - doins gap/*.xwam - - insinto ${PACKAGES}/justify - doins justify/*.xwam - doins justify/*.H - - insinto ${PACKAGES}/regmatch - doins regmatch/*.xwam - insinto ${PACKAGES}/regmatch/cc - doins regmatch/cc/*.H - - insinto ${PACKAGES}/sgml - doins sgml/*.xwam - insinto ${PACKAGES}/sgml/cc - doins sgml/cc/*.H - insinto ${PACKAGES}/sgml/cc/dtd - doins sgml/cc/dtd/* - - insinto ${PACKAGES}/slx - doins slx/*.xwam - - insinto ${PACKAGES}/wildmatch - doins wildmatch/*.xwam - insinto ${PACKAGES}/wildmatch/cc - doins wildmatch/cc/*.H - - if use libwww ; then - insinto ${PACKAGES}/libwww - doins libwww/*.xwam - insinto ${PACKAGES}/libwww/cc - doins libwww/cc/*.H - fi - - if use mysql || use odbc ; then - insinto ${PACKAGES}/dbdrivers - doins dbdrivers/*.xwam - doins dbdrivers/*.H - insinto ${PACKAGES}/dbdrivers/cc - doins dbdrivers/cc/*.H - if use mysql ; then - insinto ${PACKAGES}/dbdrivers/mysql - doins dbdrivers/mysql/*.xwam - insinto ${PACKAGES}/dbdrivers/mysql/cc - doins dbdrivers/mysql/cc/*.H - fi - if use odbc ; then - insinto ${PACKAGES}/dbdrivers/odbc - doins dbdrivers/odbc/*.xwam - insinto ${PACKAGES}/dbdrivers/odbc/cc - doins dbdrivers/odbc/cc/*.H - fi - fi - - if use perl ; then - insinto ${PACKAGES}/perlmatch - doins perlmatch/*.xwam - insinto ${PACKAGES}/perlmatch/cc - doins perlmatch/cc/*.H - fi - - if use xml ; then - insinto ${PACKAGES}/xpath - doins xpath/*xwam - insinto ${PACKAGES}/xpath/cc - doins xpath/cc/*.H - fi - - cd "${S}" - dodoc FAQ README -} diff --git a/dev-lang/xsb/xsb-3.2.ebuild b/dev-lang/xsb/xsb-3.2.ebuild deleted file mode 100644 index b943c12f0277..000000000000 --- a/dev-lang/xsb/xsb-3.2.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.2.ebuild,v 1.4 2010/07/09 10:38:01 keri Exp $ - -MY_P="XSB" - -PATCHSET_VER="2" - -inherit eutils autotools java-pkg-opt-2 - -DESCRIPTION="XSB is a logic programming and deductive database system" -HOMEPAGE="http://xsb.sourceforge.net" -SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug examples iodbc java libwww mysql odbc perl threads xml" - -RDEPEND="iodbc? ( dev-db/libiodbc ) - java? ( >=virtual/jdk-1.4 ) - libwww? ( net-libs/libwww ) - mysql? ( virtual/mysql ) - odbc? ( dev-db/unixODBC ) - perl? ( dev-lang/perl ) - xml? ( dev-libs/libxml2 )" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV} - - cd "${S}"/build - eautoconf -} - -src_compile() { - cd "${S}"/build - - econf \ - --disable-optimization \ - --without-smodels \ - --with-config-tag="" \ - $(use_with java interprolog) \ - $(use_with odbc) \ - $(use_with iodbc) \ - $(use_enable threads mt) \ - $(use_enable debug) \ - $(use_enable debug debug-verbose) \ - $(use_enable debug profile) \ - || die "econf failed" - emake || die "emake failed" - - if use libwww ; then - cd "${S}"/packages/libwww - econf --with-libwww=/usr || die "econf libwww package failed" - fi - - if use mysql ; then - cd "${S}"/packages/dbdrivers/mysql - econf || die "econf mysql package failed" - fi - - if use odbc ; then - cd "${S}"/packages/dbdrivers/odbc - econf || die "econf odbc package failed" - fi - - if use xml ; then - cd "${S}"/packages/xpath - econf || die "econf xpath package failed" - fi - - # All XSB Packages are compiled using a single Prolog engine. - # Consequently they must all be compiled using a single make job. - - cd "${S}"/packages - rm -rf *.xwam - emake -j1 || die "emake packages failed" - - if use libwww ; then - emake -j1 libwww || die "emake libwww package failed" - fi - - if use mysql ; then - emake -j1 mysql || die "emake mysql package failed" - fi - - if use odbc ; then - emake -j1 odbc || die "emake odbc package failed" - fi - - if use perl ; then - emake -j1 perlmatch || die "emake perlmatch package failed" - fi - - if use xml ; then - emake -j1 xpath || die "emake xpath package failed" - fi -} - -src_install() { - cd "${S}"/build - make DESTDIR="${D}" install || die "make install failed" - - local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV} - dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb - - cd "${S}"/packages - local PACKAGES=${XSB_INSTALL_DIR}/packages - insinto ${PACKAGES} - doins *.xwam - - insinto ${PACKAGES}/chr - doins chr/*.xwam - - insinto ${PACKAGES}/chr_d - doins chr_d/*.xwam - - insinto ${PACKAGES}/gap - doins gap/*.xwam - - insinto ${PACKAGES}/justify - doins justify/*.xwam - doins justify/*.H - - insinto ${PACKAGES}/regmatch - doins regmatch/*.xwam - insinto ${PACKAGES}/regmatch/cc - doins regmatch/cc/*.H - - insinto ${PACKAGES}/sgml - doins sgml/*.xwam - insinto ${PACKAGES}/sgml/cc - doins sgml/cc/*.H - insinto ${PACKAGES}/sgml/cc/dtd - doins sgml/cc/dtd/* - - insinto ${PACKAGES}/slx - doins slx/*.xwam - - insinto ${PACKAGES}/wildmatch - doins wildmatch/*.xwam - insinto ${PACKAGES}/wildmatch/cc - doins wildmatch/cc/*.H - - if use libwww ; then - insinto ${PACKAGES}/libwww - doins libwww/*.xwam - insinto ${PACKAGES}/libwww/cc - doins libwww/cc/*.H - fi - - if use mysql || use odbc ; then - insinto ${PACKAGES}/dbdrivers - doins dbdrivers/*.xwam - doins dbdrivers/*.H - insinto ${PACKAGES}/dbdrivers/cc - doins dbdrivers/cc/*.H - if use mysql ; then - insinto ${PACKAGES}/dbdrivers/mysql - doins dbdrivers/mysql/*.xwam - insinto ${PACKAGES}/dbdrivers/mysql/cc - doins dbdrivers/mysql/cc/*.H - fi - if use odbc ; then - insinto ${PACKAGES}/dbdrivers/odbc - doins dbdrivers/odbc/*.xwam - insinto ${PACKAGES}/dbdrivers/odbc/cc - doins dbdrivers/odbc/cc/*.H - fi - fi - - if use perl ; then - insinto ${PACKAGES}/perlmatch - doins perlmatch/*.xwam - insinto ${PACKAGES}/perlmatch/cc - doins perlmatch/cc/*.H - fi - - if use xml ; then - insinto ${PACKAGES}/xpath - doins xpath/*xwam - insinto ${PACKAGES}/xpath/cc - doins xpath/cc/*.H - fi - - if use examples ; then - cd "${S}"/build - make \ - DESTDIR="${D}" \ - install_examples="${D}"/usr/share/doc/${PF}/examples \ - install_examples || die "make install_examples failed" - fi - - cd "${S}" - dodoc FAQ README -} |