summaryrefslogtreecommitdiff
path: root/lang/seed7
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2013-09-09 09:31:22 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2013-09-09 09:31:22 +0000
commit0dbb1fb2a7de39ce7d4a72d479422c2e3df602a5 (patch)
tree1fca4517ac5ea1995c3766de401329f0e9722ea3 /lang/seed7
parent- Update to version 0.12.3, which brings new Bright Novae plugin and fixes (diff)
- Update to 05_20130908
Changes: * The compiler has been improved to use charvalue instead of intvalue, when characters are initialized. Thanks go to Brian Callahan, for reporting the bug. Btw.: Brian Callahan created an openBSD port for Seed7. * The makefile mk_freebsd.mk has been added to support compilation under freeBSD. Thanks go to Pietro Cerutti, for providing it. * The makefiles mk_clang.mak and mk_freebsd.mk have been improved to use the options -ffunction-sections, -fdata-sections and *Wl,--strip-debug. * The functions bStriLe2BigInt, bytesLe2BigInt, bStriBe2BigInt, bytesBe2BigInt, bStriLe, bytesLe, bStriBe and bytesBe have been added to bytedata.s7i. This functions convert between sequences of bytes and bigInteger numbers. * In bytedata.s7i the functions bytesLeAsInt and bytesBeAsInt have been renamed to bytesLe2Int respectively bytesBe2Int. * Parameter names have been added to seed7_05.s7i, graph_file.s7i, graph.s7i, reference.s7i, pac.sd7, tetg.sd7, tet.sd7 and wiz.sd7. * Checks for the Karatsuba multiplication and the functions bytesBe, bytesLe, bytesBe2BigInt and bytesLe2BigInt have been added to chkbig.sd7. * Checks for set membership in character sets have been added to chkset.sd7. * The readability of the bitset initialisation in the compiler (s7c) has been improved. * Interpreter and compiler have been improved to support the new actions BIG_FROM_BSTRI_BE, BIG_FROM_BSTRI_LE, BIG_TO_BSTRI_BE and BIG_TO_BSTRI_LE. * The functions bigFromBytesBe, bigFromBytesLe, bigFromBStriBe, bigFromBStriLe, bigToBStriBe and bigToBStriLe have been added to both, big_gmp.c and big_rtl.c. * In big_gmp.c and big_rtl.c the function bigImport has been rewritten to use bigFromBytesBe. * The readability of the function uint2_mult in int_rtl.c has been improved. * The program chkccomp.c has been improved to check for a ones complement inttype and if casting can be used to get the element of a union. * Several makefiles have been adjusted to use 'cp -p' instead of 'cp -a'. The cp command openBSD does not support -a. * The function bigRand in big_rtl.c has been improved to avoid that a random number is outside the required range.
Notes
Notes: svn path=/head/; revision=326786
Diffstat (limited to 'lang/seed7')
-rw-r--r--lang/seed7/Makefile4
-rw-r--r--lang/seed7/distinfo4
-rw-r--r--lang/seed7/files/patch-mk_freebsd.mak257
3 files changed, 4 insertions, 261 deletions
diff --git a/lang/seed7/Makefile b/lang/seed7/Makefile
index 1713fb084be1..9858ebfb80c1 100644
--- a/lang/seed7/Makefile
+++ b/lang/seed7/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= seed7
-DISTVERSION= 05_20130820
+DISTVERSION= 05_20130908
CATEGORIES= lang
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}/
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -34,7 +34,7 @@ PORTDOCS= *
.include <bsd.port.options.mk>
-MAKEFILE= mk_freebsd.mak
+MAKEFILE= mk_freebsd.mk
post-patch:
${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g;' ${WRKSRC}/${MAKEFILE}
diff --git a/lang/seed7/distinfo b/lang/seed7/distinfo
index 744914108bdf..9188d61245e7 100644
--- a/lang/seed7/distinfo
+++ b/lang/seed7/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seed7_05_20130820.tgz) = a2c1c4b6da144e56054967f786948f2ac128cca47f6fb19d8ccb4b3a5b275710
-SIZE (seed7_05_20130820.tgz) = 1930028
+SHA256 (seed7_05_20130908.tgz) = dc06a2f58774d4f152e0e433d6983d637c426b02f223679b0d86ee5e1368616a
+SIZE (seed7_05_20130908.tgz) = 1944548
diff --git a/lang/seed7/files/patch-mk_freebsd.mak b/lang/seed7/files/patch-mk_freebsd.mak
deleted file mode 100644
index a4e0dbb6cbaa..000000000000
--- a/lang/seed7/files/patch-mk_freebsd.mak
+++ /dev/null
@@ -1,257 +0,0 @@
---- /dev/null 2013-08-27 14:33:00.000000000 +0200
-+++ mk_freebsd.mak 2013-08-27 14:39:08.000000000 +0200
-@@ -0,0 +1,254 @@
-+# Makefile for the FreeBSD ports system using whatever compiler the user has set. Commands executed by: sh
-+# To compile use a command shell and call:
-+# make -f mk_freebsd.mak depend
-+# make -f mk_freebsd.mak
-+# If you are under windows you should use MinGW with mk_mingw.mak, mk_nmake.mak or mk_msys.mak instead.
-+
-+# CFLAGS =
-+# CFLAGS = -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith
-+# CFLAGS = -O2 -fomit-frame-pointer -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith
-+# CFLAGS = -O2 -g -Wall -Wextra -Wswitch-default -Wswitch-enum -Wcast-qual -Waggregate-return -Wwrite-strings -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -Wmissing-noreturn -Wno-multichar -Wc++-compat
-+# CFLAGS = -O2 -g -x c++ -Wall -Wextra -Wswitch-default -Wswitch-enum -Wcast-qual -Waggregate-return -Wwrite-strings -Winline -Wconversion -Wshadow -Wpointer-arith -Wmissing-noreturn -Wno-multichar
-+# CFLAGS = -O2 -fomit-frame-pointer -Wall -Wextra -Wswitch-default -Wcast-qual -Waggregate-return -Wwrite-strings -Winline -Wconversion -Wshadow -Wpointer-arith -Wmissing-noreturn -Wno-multichar
-+CFLAGS = -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -ftrapv -I%%LOCALBASE%%/include
-+# CFLAGS = -O2 -g -x c++ -Wall -Winline -Wconversion -Wshadow -Wpointer-arith -ftrapv
-+# CFLAGS = -O2 -g -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith
-+# CFLAGS = -O2 -g -Wall -Winline -Wconversion -Wshadow -Wpointer-arith
-+# CFLAGS = -O2 -g -Wall
-+# CFLAGS = -O2 -g -pg -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith
-+# CFLAGS = -O2 -fomit-frame-pointer -funroll-loops -Wall
-+# CFLAGS = -O2 -funroll-loops -Wall -pg
-+LDFLAGS = -L%%LOCALBASE%%/lib
-+# LDFLAGS = -pg
-+# LDFLAGS = -pg -lc_p
-+SYSTEM_LIBS = -lm
-+# SYSTEM_LIBS = -lm -lgmp
-+# SYSTEM_LIBS = -lm_p -lc_p
-+SYSTEM_CONSOLE_LIBS = -lncurses
-+SYSTEM_DRAW_LIBS = -lX11
-+# SYSTEM_DRAW_LIBS = /usr/Xlib/libX11.so
-+# SYSTEM_DRAW_LIBS = -lX11 -lXext
-+# SYSTEM_DRAW_LIBS = -lGL -lGLEW -lglut
-+# SYSTEM_DRAW_LIBS = -lGL -lGLEW -lX11
-+SEED7_LIB = seed7_05.a
-+CONSOLE_LIB = s7_con.a
-+DRAW_LIB = s7_draw.a
-+COMP_DATA_LIB = s7_data.a
-+COMPILER_LIB = s7_comp.a
-+ALL_S7_LIBS = ../bin/$(COMPILER_LIB) ../bin/$(COMP_DATA_LIB) ../bin/$(DRAW_LIB) ../bin/$(CONSOLE_LIB) ../bin/$(SEED7_LIB)
-+GET_CC_VERSION_INFO = $(CC) --version >
-+
-+BIGINT_LIB_DEFINE = USE_BIG_RTL_LIBRARY
-+BIGINT_LIB = big_rtl
-+# BIGINT_LIB_DEFINE = USE_BIG_GMP_LIBRARY
-+# BIGINT_LIB = big_gmp
-+
-+TERMINFO_OR_TERMCAP = USE_TERMINFO
-+CONSOLE_LIB_OBJ = kbd_rtl.o con_inf.o kbd_inf.o trm_inf.o
-+CONSOLE_LIB_SRC = kbd_rtl.c con_inf.c kbd_inf.c trm_inf.c
-+# TERMINFO_OR_TERMCAP = USE_TERMCAP
-+# CONSOLE_LIB_OBJ = kbd_rtl.o con_inf.o kbd_inf.o trm_cap.o
-+# CONSOLE_LIB_SRC = kbd_rtl.c con_inf.c kbd_inf.c trm_cap.c
-+# TERMINFO_OR_TERMCAP = USE_TERMINFO
-+# CONSOLE_LIB_OBJ = kbd_rtl.o con_inf.o kbd_poll.o trm_inf.o
-+# CONSOLE_LIB_SRC = kbd_rtl.c con_inf.c kbd_poll.c trm_inf.c
-+# TERMINFO_OR_TERMCAP = USE_TERMCAP
-+# CONSOLE_LIB_OBJ = kbd_rtl.o con_inf.o kbd_poll.o trm_cap.o
-+# CONSOLE_LIB_SRC = kbd_rtl.c con_inf.c kbd_poll.c trm_cap.c
-+
-+# CONSOLE_LIB_OBJ = kbd_rtl.o con_cur.o
-+# CONSOLE_LIB_SRC = kbd_rtl.c con_cur.c
-+# CONSOLE_LIB_OBJ = kbd_rtl.o con_cap.o
-+# CONSOLE_LIB_SRC = kbd_rtl.c con_cap.c
-+# CONSOLE_LIB_OBJ = kbd_rtl.o con_tcp.o
-+# CONSOLE_LIB_SRC = kbd_rtl.c con_tcp.c
-+# CONSOLE_LIB_OBJ = kbd_rtl.o con_x11.o
-+# CONSOLE_LIB_SRC = kbd_rtl.c con_x11.c
-+# CONSOLE_LIB_OBJ = kbd_rtl.o con_win.o
-+# CONSOLE_LIB_SRC = kbd_rtl.c con_win.c
-+
-+MOBJ = s7.o
-+POBJ = runerr.o option.o primitiv.o
-+LOBJ = actlib.o arrlib.o biglib.o binlib.o blnlib.o bstlib.o chrlib.o cmdlib.o conlib.o dcllib.o \
-+ drwlib.o enulib.o fillib.o fltlib.o hshlib.o intlib.o itflib.o kbdlib.o lstlib.o pollib.o \
-+ prclib.o prglib.o reflib.o rfllib.o sctlib.o setlib.o soclib.o strlib.o timlib.o typlib.o \
-+ ut8lib.o
-+EOBJ = exec.o doany.o objutl.o
-+AOBJ = act_comp.o prg_comp.o analyze.o syntax.o token.o parser.o name.o type.o \
-+ expr.o atom.o object.o scanner.o literal.o numlit.o findid.o \
-+ error.o infile.o libpath.o symbol.o info.o stat.o fatal.o match.o
-+GOBJ = syvarutl.o traceutl.o actutl.o executl.o blockutl.o \
-+ entutl.o identutl.o chclsutl.o sigutl.o arrutl.o
-+ROBJ = arr_rtl.o bln_rtl.o bst_rtl.o chr_rtl.o cmd_rtl.o con_rtl.o dir_rtl.o drw_rtl.o fil_rtl.o \
-+ flt_rtl.o hsh_rtl.o int_rtl.o itf_rtl.o set_rtl.o soc_rtl.o str_rtl.o tim_rtl.o ut8_rtl.o \
-+ heaputl.o striutl.o
-+DOBJ = $(BIGINT_LIB).o cmd_unx.o fil_unx.o pol_unx.o tim_unx.o
-+OBJ = $(MOBJ)
-+SEED7_LIB_OBJ = $(ROBJ) $(DOBJ)
-+DRAW_LIB_OBJ = gkb_rtl.o drw_x11.o gkb_x11.o
-+COMP_DATA_LIB_OBJ = typ_data.o rfl_data.o ref_data.o listutl.o flistutl.o typeutl.o datautl.o
-+COMPILER_LIB_OBJ = $(POBJ) $(LOBJ) $(EOBJ) $(AOBJ) $(GOBJ)
-+
-+MSRC = s7.c
-+PSRC = runerr.c option.c primitiv.c
-+LSRC = actlib.c arrlib.c biglib.c binlib.c blnlib.c bstlib.c chrlib.c cmdlib.c conlib.c dcllib.c \
-+ drwlib.c enulib.c fillib.c fltlib.c hshlib.c intlib.c itflib.c kbdlib.c lstlib.c pollib.c \
-+ prclib.c prglib.c reflib.c rfllib.c sctlib.c setlib.c soclib.c strlib.c timlib.c typlib.c \
-+ ut8lib.c
-+ESRC = exec.c doany.c objutl.c
-+ASRC = act_comp.c prg_comp.c analyze.c syntax.c token.c parser.c name.c type.c \
-+ expr.c atom.c object.c scanner.c literal.c numlit.c findid.c \
-+ error.c infile.c libpath.c symbol.c info.c stat.c fatal.c match.c
-+GSRC = syvarutl.c traceutl.c actutl.c executl.c blockutl.c \
-+ entutl.c identutl.c chclsutl.c sigutl.c arrutl.c
-+RSRC = arr_rtl.c bln_rtl.c bst_rtl.c chr_rtl.c cmd_rtl.c con_rtl.c dir_rtl.c drw_rtl.c fil_rtl.c \
-+ flt_rtl.c hsh_rtl.c int_rtl.c itf_rtl.c set_rtl.c soc_rtl.c str_rtl.c tim_rtl.c ut8_rtl.c \
-+ heaputl.c striutl.c
-+DSRC = $(BIGINT_LIB).c cmd_unx.c fil_unx.c pol_unx.c tim_unx.c
-+SRC = $(MSRC)
-+SEED7_LIB_SRC = $(RSRC) $(DSRC)
-+DRAW_LIB_SRC = gkb_rtl.c drw_x11.c gkb_x11.c
-+COMP_DATA_LIB_SRC = typ_data.c rfl_data.c ref_data.c listutl.c flistutl.c typeutl.c datautl.c
-+COMPILER_LIB_SRC = $(PSRC) $(LSRC) $(ESRC) $(ASRC) $(GSRC)
-+
-+s7: ../bin/s7 ../prg/s7
-+ ../bin/s7 -l ../lib level
-+
-+s7c: ../bin/s7c ../prg/s7c
-+
-+../bin/s7: $(OBJ) $(ALL_S7_LIBS)
-+ $(CC) $(LDFLAGS) $(OBJ) $(ALL_S7_LIBS) $(SYSTEM_DRAW_LIBS) $(SYSTEM_CONSOLE_LIBS) $(SYSTEM_LIBS) -o ../bin/s7
-+
-+../prg/s7:
-+ ln -s ../bin/s7 ../prg
-+
-+../bin/s7c: ../prg/s7c
-+ cp -a ../prg/s7c ../bin
-+
-+../prg/s7c: ../prg/s7c.sd7 $(ALL_S7_LIBS)
-+ ../bin/s7 -l ../lib ../prg/s7c -l ../lib -b ../bin -O2 ../prg/s7c
-+
-+clear: clean
-+
-+clean:
-+ rm -f *.o ../bin/*.a ../bin/s7 ../bin/s7c ../prg/s7 ../prg/s7c depend chkccomp.h version.h
-+
-+distclean: clean
-+ cp level_bk.h level.h
-+
-+test:
-+ ../bin/s7 -l ../lib ../prg/chk_all build
-+
-+dep: depend
-+
-+hi: s7
-+
-+strip:
-+ strip ../bin/s7
-+
-+chkccomp.h:
-+ echo "#include \"sys/stat.h\"" > chkccomp.h
-+ echo "#include \"sys/types.h\"" >> chkccomp.h
-+ echo "#include \"unistd.h\"" >> chkccomp.h
-+ echo "#define LIST_DIRECTORY_CONTENTS \"ls\"" >> chkccomp.h
-+
-+version.h: chkccomp.h
-+ echo "#define PATH_DELIMITER '/'" > version.h
-+ echo "#define USE_DIRENT" >> version.h
-+ echo "#define SEARCH_PATH_DELIMITER ':'" >> version.h
-+ echo "#define CATCH_SIGNALS" >> version.h
-+ echo "#define SIGILL_ON_OVERFLOW" >> version.h
-+ echo "#define HAS_SYMLINKS" >> version.h
-+ echo "#define HAS_FIFO_FILES" >> version.h
-+ echo "#define USE_MMAP" >> version.h
-+ echo "#define AWAIT_WITH_SELECT" >> version.h
-+ echo "#define $(TERMINFO_OR_TERMCAP)" >> version.h
-+ echo "#define CONSOLE_UTF8" >> version.h
-+ echo "#define OS_STRI_UTF8" >> version.h
-+ echo "#define _FILE_OFFSET_BITS 64" >> version.h
-+ echo "#define os_fseek fseeko" >> version.h
-+ echo "#define os_ftell ftello" >> version.h
-+ echo "#define os_off_t off_t" >> version.h
-+ echo "#define os_environ environ" >> version.h
-+ echo "#define USE_GETADDRINFO" >> version.h
-+ echo "#define ESCAPE_SHELL_COMMANDS" >> version.h
-+ echo "#define USE_SIGSETJMP" >> version.h
-+ echo "#define $(BIGINT_LIB_DEFINE)" >> version.h
-+ echo "#define OBJECT_FILE_EXTENSION \".o\"" >> version.h
-+ echo "#define LIBRARY_FILE_EXTENSION \".a\"" >> version.h
-+ echo "#define C_COMPILER \"$(CC)\"" >> version.h
-+ echo "#define CPLUSPLUS_COMPILER \"$(CC) -x c++\"" >> version.h
-+ echo "#define GET_CC_VERSION_INFO \"$(GET_CC_VERSION_INFO)\"" >> version.h
-+ echo "#define CC_SOURCE_UTF8" >> version.h
-+ echo "#define CC_OPT_DEBUG_INFO \"-g\"" >> version.h
-+ echo "#define CC_OPT_NO_WARNINGS \"-w\"" >> version.h
-+ echo "#define CC_FLAGS \"-ftrapv\"" >> version.h
-+ echo "#define REDIRECT_C_ERRORS \"2>\"" >> version.h
-+ echo "#define LINKER_OPT_OUTPUT_FILE \"-o \"" >> version.h
-+ echo "#define LINKER_FLAGS \"$(LDFLAGS)\"" >> version.h
-+ $(GET_CC_VERSION_INFO) cc_vers.txt
-+ $(CC) -ftrapv chkccomp.c -lm -o chkccomp
-+ ./chkccomp >> version.h
-+ rm chkccomp
-+ rm cc_vers.txt
-+ echo "#define SYSTEM_LIBS \"$(SYSTEM_LIBS)\"" >> version.h
-+ echo "#define SYSTEM_CONSOLE_LIBS \"$(SYSTEM_CONSOLE_LIBS)\"" >> version.h
-+ echo "#define SYSTEM_DRAW_LIBS \"$(SYSTEM_DRAW_LIBS)\"" >> version.h
-+ echo "#define SEED7_LIB \"$(SEED7_LIB)\"" >> version.h
-+ echo "#define CONSOLE_LIB \"$(CONSOLE_LIB)\"" >> version.h
-+ echo "#define DRAW_LIB \"$(DRAW_LIB)\"" >> version.h
-+ echo "#define COMP_DATA_LIB \"$(COMP_DATA_LIB)\"" >> version.h
-+ echo "#define COMPILER_LIB \"$(COMPILER_LIB)\"" >> version.h
-+ $(CC) setpaths.c -o setpaths
-+ ./setpaths "S7_LIB_DIR=$(S7_LIB_DIR)" "SEED7_LIBRARY=$(SEED7_LIBRARY)" >> version.h
-+ rm setpaths
-+
-+depend: version.h
-+ $(CC) $(CFLAGS) -M $(SRC) > depend
-+ $(CC) $(CFLAGS) -M $(SEED7_LIB_SRC) >> depend
-+ $(CC) $(CFLAGS) -M $(CONSOLE_LIB_SRC) >> depend
-+ $(CC) $(CFLAGS) -M $(DRAW_LIB_SRC) >> depend
-+ $(CC) $(CFLAGS) -M $(COMP_DATA_LIB_SRC) >> depend
-+ $(CC) $(CFLAGS) -M $(COMPILER_LIB_SRC) >> depend
-+
-+level.h:
-+ ../bin/s7 -l ../lib level
-+
-+../bin/$(SEED7_LIB): $(SEED7_LIB_OBJ)
-+ ar r ../bin/$(SEED7_LIB) $(SEED7_LIB_OBJ)
-+
-+../bin/$(CONSOLE_LIB): $(CONSOLE_LIB_OBJ)
-+ ar r ../bin/$(CONSOLE_LIB) $(CONSOLE_LIB_OBJ)
-+
-+../bin/$(DRAW_LIB): $(DRAW_LIB_OBJ)
-+ ar r ../bin/$(DRAW_LIB) $(DRAW_LIB_OBJ)
-+
-+../bin/$(COMP_DATA_LIB): $(COMP_DATA_LIB_OBJ)
-+ ar r ../bin/$(COMP_DATA_LIB) $(COMP_DATA_LIB_OBJ)
-+
-+../bin/$(COMPILER_LIB): $(COMPILER_LIB_OBJ)
-+ ar r ../bin/$(COMPILER_LIB) $(COMPILER_LIB_OBJ)
-+
-+wc: $(SRC)
-+ echo SRC:
-+ wc $(SRC)
-+ echo SEED7_LIB_SRC:
-+ wc $(SEED7_LIB_SRC)
-+ echo CONSOLE_LIB_SRC:
-+ wc $(CONSOLE_LIB_SRC)
-+ echo DRAW_LIB_SRC:
-+ wc $(DRAW_LIB_SRC)
-+ echo COMP_DATA_LIB_SRC:
-+ wc $(COMP_DATA_LIB_SRC)
-+ echo COMPILER_LIB_SRC:
-+ wc $(COMPILER_LIB_SRC)
-+
-+lint: $(SRC)
-+ lint -p $(SRC) $(SYSTEM_DRAW_LIBS) $(SYSTEM_CONSOLE_LIBS) $(SYSTEM_LIBS)
-+
-+lint2: $(SRC)
-+ lint -Zn2048 $(SRC) $(SYSTEM_DRAW_LIBS) $(SYSTEM_CONSOLE_LIBS) $(SYSTEM_LIBS)
-+
-+.if exists(depend)
-+.include "depend"
-+.endif