kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 2.6

Browse source 
PR:		ports/62205
Submitted by:	Christopher Rued <c.rued@xsb.com> (maintainer)
This commit is contained in:
Pav Lucistnik 2004-02-01 17:50:56 +00:00
parent d255b61984
commit 13ba5647d6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=99724
11 changed files with 1885 additions and 1761 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lang/xsb/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= XSB
PORTVERSION= 2.5
PORTVERSION= 2.6
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
@ -25,8 +25,9 @@ PLIST_SUB+= MACHINE_ARCH=${MACHINE_ARCH} \
do-build:
@ cd ${WRKSRC} ; \
./configure ; \
./makexsb
./configure ; \
./makexsb ; \
./makexsb dynmodule
do-install:
@ ${CP} -r ${WRKDIR}/XSB ${PREFIX} ; \

2
lang/xsb/distinfo
View file

@ -1 +1 @@
MD5 (XSB-2_5.tar.gz) = 30d747cf9659af6701062ef198ef552a
MD5 (XSB-2_6.tar.gz) = 2d16e16515ae1a80708300d93f075675

70
lang/xsb/files/patch-aa
View file

@ -1,70 +0,0 @@
--- configure.orig Sat Apr 27 11:18:26 2002
+++ configure Sat Apr 27 11:02:49 2002
@@ -1664,7 +1664,7 @@
CFLAGS=""
c_inline_level=""
else
- 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
@@ -1676,9 +1676,9 @@
fi
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
@@ -1687,23 +1687,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.
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"
;;
@@ -3231,12 +3231,12 @@
# 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

70
lang/xsb/files/patch-ab
View file

@ -1,70 +0,0 @@
--- configure.in.orig Sat Apr 27 11:20:37 2002
+++ configure.in Sat Apr 27 11:20:21 2002
@@ -652,7 +652,7 @@
CFLAGS=""
c_inline_level=""
else
- 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
@@ -664,9 +664,9 @@
fi
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
@@ -675,23 +675,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.
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"
;;
@@ -1161,12 +1161,12 @@
# 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

14
lang/xsb/files/patch-ac
View file

@ -1,14 +0,0 @@
--- makexsb.in.orig Sat Apr 27 11:23:44 2002
+++ makexsb.in Sat Apr 27 11:23:32 2002
@@ -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?"

67
lang/xsb/files/patch-ad
View file

@ -1,67 +0,0 @@
--- topMakefile.in.orig Sat Apr 27 11:25:35 2002
+++ topMakefile.in Sat Apr 27 11:26:48 2002
@@ -172,9 +172,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 || \
@@ -182,7 +182,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:
@@ -190,7 +190,7 @@
echo "Compiling smodels interface"; \
rm -f *.o Makefile *.h *.O *.so 2>/dev/null || echo ""; \
ln -s ${src_config_prefix}/smoMakefile ./Makefile; \
- make CROSS_SIMULATOR=@CROSS_SIMULATOR@ XSB=$(src_scriptdir)/xsb$(config_tag) @smodels_goal@ 2>&1\
+ gmake CROSS_SIMULATOR=@CROSS_SIMULATOR@ 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
@@ -201,10 +201,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
@@ -394,10 +394,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::
@@ -419,7 +419,7 @@
@cd ../packages; ../build/clean_pkgs.sh
@-cd ${src_examples}; rm -f *.O *.o *~ */*.O */*.o */*~
@echo "Cleaning up ${src_libdir}"
- @-(cd ${src_libdir}; make clean)
+ @-(cd ${src_libdir}; gmake clean)
# recreate the makefiles
again: Makefile.in emuMakefile.in config.status ${src_config_prefix}/config.cache

23
lang/xsb/files/patch-ae
View file

@ -1,23 +0,0 @@
--- ../Makefile.orig Sat Apr 27 11:28:50 2002
+++ ../Makefile Sat Apr 27 11:28:39 2002
@@ -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

4
lang/xsb/files/patch-ag
View file

@ -1,5 +1,5 @@
--- config.guess.orig Tue Jun 18 11:40:04 2002
+++ config.guess Tue Jun 18 11:40:48 2002
--- config.guess.orig Sat Jan 31 01:56:33 2004
+++ config.guess Sat Jan 31 02:03:04 2004
@@ -79,7 +79,7 @@
fi

17
lang/xsb/files/patch-ah Normal file
View file

@ -0,0 +1,17 @@
--- ../emu/std_pred_xsb_i.h.orig Sat Jan 31 02:08:02 2004
+++ ../emu/std_pred_xsb_i.h Sat Jan 31 02:16:16 2004
@@ -485,8 +485,12 @@
if (isfloat(term)) {
sprintf(str, "%e", float_val(term));
} else {
- err_handle(TYPE, 1, call_name, 2, "number", term);
- return FALSE; /* fail */
+ if (isboxedinteger(term)) {
+ sprintf(str, "%ld", (long)boxedint_val(term));
+ } else {
+ err_handle(TYPE, 1, call_name, 2, "number", term);
+ return FALSE; /* fail */
+ }
}
}
new_list = makelist(hreg);

3
lang/xsb/pkg-descr
View file

@ -12,3 +12,6 @@ not. Users interested in Parsing, Program Analysis, Model-checking,
Data Mining and Diagnosis may benefit from XSB.
WWW: http://xsb.sourceforge.net/
- Christopher Rued
c.rued@xsb.com

3369
lang/xsb/pkg-plist
View file

File diff suppressed because it is too large Load diff