6 files changed, 276 insertions, 0 deletions

diff --git a/lang/xsb/files/patch-aa b/lang/xsb/files/patch-aa
new file mode 100644
index 000000000000..0eaa3a3e9dd1
--- /dev/null
+++ b/lang/xsb/files/patch-aa
@@ -0,0 +1,76 @@
+--- configure.old	Thu Jul  5 12:42:10 2001
++++ configure	Sun Jul 29 15:51:36 2001
+@@ -1561,7 +1561,7 @@
+ # if --with-gcc, take it as a sign of trouble 
+ # with gcc and lower optimization levels
+ if test -n "$with_gcc" ; then
+-	emuloop_opt_level=-${optimization_level-"O4 -fomit-frame-pointer"}
++	emuloop_opt_level=-${optimization_level-"O2 -fomit-frame-pointer"}
+ 	trutils_opt_level=-${optimization_level-"O1 -fomit-frame-pointer"}
+ 	builtins_opt_level=-${optimization_level-"O1 -fomit-frame-pointer"}
+ 	if test -n "$optimization_level"; then
+@@ -1572,9 +1572,9 @@
+ 	CFLAGS="-Wall -ansi -pedantic"
+ else
+  case $CC in
+-   gcc) emuloop_opt_level=-${optimization_level-"O4 -fomit-frame-pointer"}
++   gcc) emuloop_opt_level=-${optimization_level-"O2 -fomit-frame-pointer"}
+ 	trutils_opt_level=-${optimization_level-"O1 -fomit-frame-pointer"}
+-	builtins_opt_level=-${optimization_level-"O4 -fomit-frame-pointer"}
++	builtins_opt_level=-${optimization_level-"O2 -fomit-frame-pointer"}
+ 	if test -n "$optimization_level"; then
+ 	   c_inline_level=""
+ 	else
+@@ -1583,23 +1583,23 @@
+ 	CFLAGS="-Wall -ansi -pedantic"
+ 	 ;;
+    cc)	if test "$__sunpro_c" = "no"; then
+-	   emuloop_opt_level=-${optimization_level-"O4"}
+-	   trutils_opt_level=-${optimization_level-"O4"}
+-	   builtins_opt_level=-${optimization_level-"O4"}
++	   emuloop_opt_level=-${optimization_level-"O2"}
++	   trutils_opt_level=-${optimization_level-"O2"}
++	   builtins_opt_level=-${optimization_level-"O2"}
+ 	else
+ 	   # emuloop_opt_level is the optimization level for emuloop.c
+-	   # Using xO4 would take SunPro more than an hour, hence xO2.
++	   # Using xO2 would take SunPro more than an hour, hence xO2.
+ 	   emuloop_opt_level=-${optimization_level-"xO2"}
+-	   trutils_opt_level=-${optimization_level-"xO4"}
+-	   builtins_opt_level=-${optimization_level-"xO4"}
++	   trutils_opt_level=-${optimization_level-"xO2"}
++	   builtins_opt_level=-${optimization_level-"xO2"}
+ 	fi
+ 	c_inline_level=""
+ 	CFLAGS=""
+ 	;;
+    acc) # acc also seems to choke on high optimization levels for emuloop.c
+ 	emuloop_opt_level=-${optimization_level-"O2"}
+-	trutils_opt_level=-${optimization_level-"O4"}
+-	builtins_opt_level=-${optimization_level-"O4"}
++	trutils_opt_level=-${optimization_level-"O2"}
++	builtins_opt_level=-${optimization_level-"O2"}
+ 	c_inline_level=""
+ 	CFLAGS="-Xa"
+ 	;;
+@@ -3006,16 +3006,16 @@
+ #fi
+ 
+ 
+-# Normally, the optimization level will be O4. 
++# Normally, the optimization level will be O2. 
+ # SGI64 must have O1 and 32 bit SGI's can have O2
+ if test "$__sunpro_c" = "no"; then
+    if test "$CC" = "gcc" ; then
+-	c_opt_level=-${optimization_level-"O4 -fomit-frame-pointer"}
++	c_opt_level=-${optimization_level-"O2 -fomit-frame-pointer"}
+    else
+-	c_opt_level=-${optimization_level-"O4"}
++	c_opt_level=-${optimization_level-"O2"}
+    fi
+ else
+-   c_opt_level=-${optimization_level-"xO4"}
++   c_opt_level=-${optimization_level-"xO2"}
+ fi
+ 
+ 
diff --git a/lang/xsb/files/patch-ab b/lang/xsb/files/patch-ab
new file mode 100644
index 000000000000..b3f39d714fbe
--- /dev/null
+++ b/lang/xsb/files/patch-ab
@@ -0,0 +1,76 @@
+--- configure.in.old	Thu Jul  5 12:42:10 2001
++++ configure.in	Sun Jul 29 15:52:05 2001
+@@ -579,7 +579,7 @@
+ # if --with-gcc, take it as a sign of trouble 
+ # with gcc and lower optimization levels
+ if test -n "$with_gcc" ; then
+-	emuloop_opt_level=-${optimization_level-"O4 -fomit-frame-pointer"}
++	emuloop_opt_level=-${optimization_level-"O2 -fomit-frame-pointer"}
+ 	trutils_opt_level=-${optimization_level-"O1 -fomit-frame-pointer"}
+ 	builtins_opt_level=-${optimization_level-"O1 -fomit-frame-pointer"}
+ 	if test -n "$optimization_level"; then
+@@ -590,9 +590,9 @@
+ 	CFLAGS="-Wall -ansi -pedantic"
+ else
+  case $CC in
+-   gcc) emuloop_opt_level=-${optimization_level-"O4 -fomit-frame-pointer"}
++   gcc) emuloop_opt_level=-${optimization_level-"O2 -fomit-frame-pointer"}
+ 	trutils_opt_level=-${optimization_level-"O1 -fomit-frame-pointer"}
+-	builtins_opt_level=-${optimization_level-"O4 -fomit-frame-pointer"}
++	builtins_opt_level=-${optimization_level-"O2 -fomit-frame-pointer"}
+ 	if test -n "$optimization_level"; then
+ 	   c_inline_level=""
+ 	else
+@@ -601,23 +601,23 @@
+ 	CFLAGS="-Wall -ansi -pedantic"
+ 	 ;;
+    cc)	if test "$__sunpro_c" = "no"; then
+-	   emuloop_opt_level=-${optimization_level-"O4"}
+-	   trutils_opt_level=-${optimization_level-"O4"}
+-	   builtins_opt_level=-${optimization_level-"O4"}
++	   emuloop_opt_level=-${optimization_level-"O2"}
++	   trutils_opt_level=-${optimization_level-"O2"}
++	   builtins_opt_level=-${optimization_level-"O2"}
+ 	else
+ 	   # emuloop_opt_level is the optimization level for emuloop.c
+-	   # Using xO4 would take SunPro more than an hour, hence xO2.
++	   # Using xO2 would take SunPro more than an hour, hence xO2.
+ 	   emuloop_opt_level=-${optimization_level-"xO2"}
+-	   trutils_opt_level=-${optimization_level-"xO4"}
+-	   builtins_opt_level=-${optimization_level-"xO4"}
++	   trutils_opt_level=-${optimization_level-"xO2"}
++	   builtins_opt_level=-${optimization_level-"xO2"}
+ 	fi
+ 	c_inline_level=""
+ 	CFLAGS=""
+ 	;;
+    acc) # acc also seems to choke on high optimization levels for emuloop.c
+ 	emuloop_opt_level=-${optimization_level-"O2"}
+-	trutils_opt_level=-${optimization_level-"O4"}
+-	builtins_opt_level=-${optimization_level-"O4"}
++	trutils_opt_level=-${optimization_level-"O2"}
++	builtins_opt_level=-${optimization_level-"O2"}
+ 	c_inline_level=""
+ 	CFLAGS="-Xa"
+ 	;;
+@@ -1036,16 +1036,16 @@
+ #fi
+ 
+ 
+-# Normally, the optimization level will be O4. 
++# Normally, the optimization level will be O2. 
+ # SGI64 must have O1 and 32 bit SGI's can have O2
+ if test "$__sunpro_c" = "no"; then
+    if test "$CC" = "gcc" ; then
+-	c_opt_level=-${optimization_level-"O4 -fomit-frame-pointer"}
++	c_opt_level=-${optimization_level-"O2 -fomit-frame-pointer"}
+    else
+-	c_opt_level=-${optimization_level-"O4"}
++	c_opt_level=-${optimization_level-"O2"}
+    fi
+ else
+-   c_opt_level=-${optimization_level-"xO4"}
++   c_opt_level=-${optimization_level-"xO2"}
+ fi
+ 
+ 
diff --git a/lang/xsb/files/patch-ac b/lang/xsb/files/patch-ac
new file mode 100644
index 000000000000..64f3c55ee94a
--- /dev/null
+++ b/lang/xsb/files/patch-ac
@@ -0,0 +1,14 @@
+--- makexsb.in.old	Sun Jul 29 15:37:36 2001
++++ makexsb.in	Sun Jul 29 16:18:20 2001
+@@ -74,9 +74,9 @@
+ 
+ if test -r "$makefile" ; then
+    echo ""
+-   echo "make -f ${makefile}  $makeargs"
++   echo "gmake -f ${makefile}  $makeargs"
+    echo ""
+-   make -f ${makefile}  $makeargs
++   gmake -f ${makefile}  $makeargs
+ else
+    echo "${makefile}: doesn't exist or is not readable."
+    echo "Have you configured XSB for this architecture?"
diff --git a/lang/xsb/files/patch-ad b/lang/xsb/files/patch-ad
new file mode 100644
index 000000000000..022697bb350f
--- /dev/null
+++ b/lang/xsb/files/patch-ad
@@ -0,0 +1,58 @@
+--- topMakefile.in.old	Sun Jul 29 16:23:01 2001
++++ topMakefile.in	Sun Jul 29 16:22:28 2001
+@@ -164,9 +164,9 @@
+ 
+ emu: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h
+ 	cd ${src_emudir}; \
+-	    make depend; \
++	    gmake depend; \
+ 	    rm -f $(srcdir)/build/.xsb_build_failed; \
+-	    (make EXECUTABLE="$(EXECUTABLE)" $(emumake_goal) || \
++	    (gmake 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 || \
+@@ -174,7 +174,7 @@
+ 
+ gpp:
+ 	@echo ""; echo "Making gpp"
+-	@cd $(srcdir)/gpp; make 2>&1 | tee -a ../build/Installation_summary
++	@cd $(srcdir)/gpp; gmake 2>&1 | tee -a ../build/Installation_summary
+ 
+ # Compiling the interface with sModels.
+ smodels:
+@@ -182,7 +182,7 @@
+ 	  echo "Compiling smodels interface"; \
+ 	  rm -f *.o Makefile *.h *.O *.so 2>/dev/null || echo ""; \
+ 	  ln -s ${src_config_prefix}/smoMakefile ./Makefile; \
+-	  make XSB=$(src_scriptdir)/xsb$(config_tag) @smodels_goal@ 2>&1\
++	  gmake XSB=$(src_scriptdir)/xsb$(config_tag) @smodels_goal@ 2>&1\
+ 		 | tee -a ../../build/Installation_summary
+ 
+ # Goal for making an XSB load module to be linked with external
+@@ -193,10 +193,10 @@
+ # This invokes xsboramod and xsbmod goals in emuMakefile, respectively
+ xsbmod: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h
+ 	cd ${src_emudir}; \
+-	    make $(emumake_goal)mod
++	    gmake $(emumake_goal)mod
+ 
+ xsbdll: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h
+-	cd ${src_emudir}; make dll
++	cd ${src_emudir}; gmake dll
+ 
+ emu_clean: do_cleaning inform_executable
+ 
+@@ -305,10 +305,10 @@
+ 	  chmod 644  $(install_config_libdir)/xsb_configuration.O
+ 
+ remake_dot_O_files:
+-	cd $(srcdir); make XSB=$(src_scriptdir)/xsb$(config_tag)
++	cd $(srcdir); gmake XSB=$(src_scriptdir)/xsb$(config_tag)
+ 
+ remake_dot_O_files_force:
+-	cd $(srcdir); make force XSB=$(src_scriptdir)/xsb$(config_tag)
++	cd $(srcdir); gmake force XSB=$(src_scriptdir)/xsb$(config_tag)
+ 
+ # clean for this architecture only
+ configclean::
diff --git a/lang/xsb/files/patch-ae b/lang/xsb/files/patch-ae
new file mode 100644
index 000000000000..1ce95d56b296
--- /dev/null
+++ b/lang/xsb/files/patch-ae
@@ -0,0 +1,23 @@
+--- ../Makefile.orig	Sun Jul 29 17:47:07 2001
++++ ../Makefile	Sun Jul 29 17:47:59 2001
+@@ -38,16 +38,16 @@
+ 
+ syslib::
+ 	@echo ""
+-	cd syslib; make
++	cd syslib; gmake
+ 
+ lib::
+ 	@echo ""
+-	cd lib; make
++	cd lib; gmake
+ 
+ cmplib::
+ 	@echo ""
+-	cd cmplib; make
++	cd cmplib; gmake
+ 
+ packages::
+ 	@echo ""
+-	cd packages; make
++	cd packages; gmake
diff --git a/lang/xsb/files/patch-af b/lang/xsb/files/patch-af
new file mode 100644
index 000000000000..620c21bf5aa7
--- /dev/null
+++ b/lang/xsb/files/patch-af
@@ -0,0 +1,29 @@
+--- register.sh~	Tue Apr 11 18:30:27 2000
++++ register.sh	Wed Aug  1 15:25:39 2001
+@@ -6,21 +6,15 @@
+ 
+ The installation process is now complete. The log is in: Installation_summary
+ 
+-We would like to ask you to email this log to us.
++We would like to ask you to email this log to us:
++
++    xsb-installation@lists.sourceforge.net
++
+ Installation logs help the XSB group to keep track of the usage of the
+ system on different architectures and to isolate problems more easily.
+ 
+-The log will be sent automatically to  xsb-installation@lists.sourceforge.net
+-Would you like to send us the installation log? (y/n): y
++*******************************************************************************
+ EOF
+-
+-read sendlog
+-
+-if test "$sendlog" != "n" -a "$sendlog" != "no" -a "$sendlog" != "N" ; then
+-    (cat sendlog.msg Installation_summary \
+-	| mail xsb-installation@lists.sourceforge.net) \
+-    && echo "" ; echo "Thank you!"; echo ""
+-fi
+ 
+ cat <<EOF
+ Should you find a bug in XSB, please report it using our bug tracking system at