- Update to 05_20130820

- Add a custom Makefile for FreeBSD, and remove the custom patches to
  the distributed Makefile.

  Changes:

  * The library sha1.s7i has been renamed to msgdigest.s7i.
  * The message digest and secure hash functions md4, md5, sha224 and
    sha256 have been added to msgdigest.s7i.
  * The new library propertyfile.s7i, which defines functions to read a
    property file into a hash table, has been added.
  * The performance of the random number generator has been improved.
    The function uint2_mult in int_rtl.c is now defined as inline
    function. The macro 'unlikely' has been added to describe that the
    initialisation of the random number generator is unlikely.
  * The function uint_mult has been added to int_rtl.c and used in
    big_rtl.c.
  * The macro 'unlikely' has been added to functions in flt_rtl.c.
  * The function bytesLeAsInt has been added to the library bytedata.s7i.
  * In bytedata.s7i the function int64AsBytesBytesLe has been renamed to
    int64AsEightBytesLe.
  * A variant of the function skipWhiteSpace has been added to the library
    scanfile.s7i.

6 files changed, 268 insertions, 73 deletions

diff --git a/lang/seed7/Makefile b/lang/seed7/Makefile
index 239b370ed8e9..1713fb084be1 100644
--- a/lang/seed7/Makefile
+++ b/lang/seed7/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seed7
-DISTVERSION=	05_20130805
+DISTVERSION=	05_20130820
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTNAME}/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
@@ -13,7 +13,6 @@ COMMENT=	High-level, extensible programming language
 
 LICENSE=	LGPL21
 
-USE_GMAKE=	yes
 USE_XORG=	x11
 MAN1=		s7.1 s7c.1
 
@@ -35,19 +34,15 @@ PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} >= 1000024 || ${CC} == clang
-MAKEFILE=	mk_clang.mak
-.else
-MAKEFILE=	makefile
-.endif
+MAKEFILE=	mk_freebsd.mak
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g;' ${WRKSRC}/makefile ${WRKSRC}/mk_clang.mak
-	${REINPLACE_CMD} -e '/FLOATTYPE_DOUBLE/s|undef|define|' ${WRKSRC}/config.h
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g;' ${WRKSRC}/${MAKEFILE}
+#	${REINPLACE_CMD} -e '/FLOATTYPE_DOUBLE/s|undef|define|' ${WRKSRC}/config.h
 
 do-build:
-	cd ${WRKSRC} && ${GMAKE} -f ${MAKEFILE} depend
-	cd ${WRKSRC} && ${GMAKE} -f ${MAKEFILE} s7 s7c
+	cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} depend
+	cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} s7 s7c
 
 do-install:
 #	install interpreter and compiler
@@ -76,6 +71,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/../doc/s7c.1 ${MANPREFIX}/man/man1
 
 regression-test: build
-	cd ${WRKSRC} && ${GMAKE} test
+	cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} test
 
 .include <bsd.port.mk>
diff --git a/lang/seed7/distinfo b/lang/seed7/distinfo
index 7bbf4a576592..744914108bdf 100644
--- a/lang/seed7/distinfo
+++ b/lang/seed7/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seed7_05_20130805.tgz) = 723bef358b15064dad8a43f3c4c0f6c67710fcf3f7c03d172f08a07a3041d149
-SIZE (seed7_05_20130805.tgz) = 1926873
+SHA256 (seed7_05_20130820.tgz) = a2c1c4b6da144e56054967f786948f2ac128cca47f6fb19d8ccb4b3a5b275710
+SIZE (seed7_05_20130820.tgz) = 1930028
diff --git a/lang/seed7/files/patch-makefile b/lang/seed7/files/patch-makefile
deleted file mode 100644
index 5d5890abe1bf..000000000000
--- a/lang/seed7/files/patch-makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- makefile.orig	2013-06-16 12:54:40.000000000 +0200
-+++ makefile	2013-07-30 10:01:44.000000000 +0200
-@@ -12,7 +12,7 @@
- # 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 = -O2 -g -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -ftrapv
- # CFLAGS = -O2 -g -x c++ -Wall -Winline -Wconversion -Wshadow -Wpointer-arith
--CFLAGS = -O2 -g -ffunction-sections -fdata-sections -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith
-+CFLAGS = -ffunction-sections -fdata-sections -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -I%%LOCALBASE%%/include
- # CFLAGS = -O2 -g -ffunction-sections -fdata-sections -Wall -Winline -Wconversion -Wshadow -Wpointer-arith
- # CFLAGS = -O2 -g -std=c99 -D_POSIX_SOURCE -ffunction-sections -fdata-sections -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith
- # CFLAGS = -O2 -g -Wall -Winline -Wconversion -Wshadow -Wpointer-arith
-@@ -20,7 +20,7 @@
- # 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 = -Wl,--gc-sections
-+LDFLAGS = -Wl,--gc-sections -L%%LOCALBASE%%/lib
- # LDFLAGS = -pg
- # LDFLAGS = -pg -lc_p
- SYSTEM_LIBS = -lm
-@@ -40,7 +40,7 @@
- COMPILER_LIB = s7_comp.a
- ALL_S7_LIBS = ../bin/$(COMPILER_LIB) ../bin/$(COMP_DATA_LIB) ../bin/$(DRAW_LIB) ../bin/$(CONSOLE_LIB) ../bin/$(SEED7_LIB)
- # CC = g++
--CC = gcc
-+CC ?= gcc
- GET_CC_VERSION_INFO = $(CC) --version >
- 
- BIGINT_LIB_DEFINE = USE_BIG_RTL_LIBRARY
diff --git a/lang/seed7/files/patch-mk_clang.mak b/lang/seed7/files/patch-mk_clang.mak
deleted file mode 100644
index 05a3b3aeb1ee..000000000000
--- a/lang/seed7/files/patch-mk_clang.mak
+++ /dev/null
@@ -1,29 +0,0 @@
---- mk_clang.mak.orig	2013-07-29 10:57:30.000000000 +0200
-+++ mk_clang.mak	2013-07-29 10:58:03.000000000 +0200
-@@ -10,7 +10,7 @@
- # 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 = -O2 -g -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -ftrapv
-+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
-@@ -18,7 +18,7 @@
- # 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 =
-+LDFLAGS = -L%%LOCALBASE%%/lib
- # LDFLAGS = -pg
- # LDFLAGS = -pg -lc_p
- SYSTEM_LIBS = -lm
-@@ -37,7 +37,7 @@
- COMPILER_LIB = s7_comp.a
- ALL_S7_LIBS = ../bin/$(COMPILER_LIB) ../bin/$(COMP_DATA_LIB) ../bin/$(DRAW_LIB) ../bin/$(CONSOLE_LIB) ../bin/$(SEED7_LIB)
- # CC = g++
--CC = clang
-+CC ?= clang
- GET_CC_VERSION_INFO = $(CC) --version >
- 
- BIGINT_LIB_DEFINE = USE_BIG_RTL_LIBRARY
diff --git a/lang/seed7/files/patch-mk_freebsd.mak b/lang/seed7/files/patch-mk_freebsd.mak
new file mode 100644
index 000000000000..a4e0dbb6cbaa
--- /dev/null
+++ b/lang/seed7/files/patch-mk_freebsd.mak
@@ -0,0 +1,257 @@
+--- /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
diff --git a/lang/seed7/pkg-plist b/lang/seed7/pkg-plist
index 4c24030bab1b..8c8841cf9ba2 100644
--- a/lang/seed7/pkg-plist
+++ b/lang/seed7/pkg-plist
@@ -83,6 +83,7 @@ lib/seed7/lib/pixmap_file.s7i
 lib/seed7/lib/pixmapfont.s7i
 lib/seed7/lib/poll.s7i
 lib/seed7/lib/progs.s7i
+lib/seed7/lib/propertyfile.s7i
 lib/seed7/lib/rational.s7i
 lib/seed7/lib/ref_list.s7i
 lib/seed7/lib/reference.s7i
@@ -91,7 +92,7 @@ lib/seed7/lib/scanfile.s7i
 lib/seed7/lib/scanstri.s7i
 lib/seed7/lib/seed7_05.s7i
 lib/seed7/lib/set.s7i
-lib/seed7/lib/sha1.s7i
+lib/seed7/lib/msgdigest.s7i
 lib/seed7/lib/shell.s7i
 lib/seed7/lib/sockbase.s7i
 lib/seed7/lib/socket.s7i