4 files changed, 121 insertions, 12 deletions

diff --git a/lang/chibi-scheme/Makefile b/lang/chibi-scheme/Makefile
index c04f11159319..2fea40987e9b 100644
--- a/lang/chibi-scheme/Makefile
+++ b/lang/chibi-scheme/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chibi-scheme
-PORTVERSION=	0.7.3
-PORTREVISION=	1
+DISTVERSION=	0.8
 CATEGORIES=	lang
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -18,19 +17,23 @@ GH_ACCOUNT=	ashinn
 USES=		gmake
 USE_LDCONFIG=	yes
 
-MAKE_ARGS=	MODDIR=${PREFIX}/lib/chibi \
+MAKE_ARGS=	IMAGE_FILES="" \
+		LDCONFIG=${TRUE} \
+		LIBDIR=${PREFIX}/lib \
 		MANDIR=${PREFIX}/man/man1 \
-		LIBCHIBI_FLAGS='-Wl,-soname="libchibi-scheme.so.${PORTVERSION}"'
+		MODDIR=${PREFIX}/lib/chibi \
+		PKGCONFDIR=${PREFIX}/libdata/pkgconfig
+# tries to generate meta files with ./chibi-scheme when it's not yet built
+MAKE_JOBS_UNSAFE=	yes
 
 ALL_TARGET=	all libchibi-scheme.a
 TEST_TARGET=	test
 
 post-patch:
 	@${REINPLACE_CMD} -e 's@ -g -g3 -O3 @ @' \
-		-e 's@$$(SOLIBDIR)/pkgconfig@${PREFIX}/libdata/pkgconfig@' \
-		-e '/$$(SO)/ s@$$(INSTALL) -m0755 @$$(BSD_INSTALL_LIB) @' \
+		-e '/$$(SO)/ s@$$(INSTALL_EXE) -m0755 @$$(BSD_INSTALL_LIB) @' \
 		-e '/tools/ s@$$(INSTALL) -m0755 @$$(BSD_INSTALL_SCRIPT) @' \
-		-e 's@$$(INSTALL) -m0755 @$$(BSD_INSTALL_PROGRAM) @' \
+		-e 's@$$(INSTALL_EXE) -m0755 @$$(BSD_INSTALL_PROGRAM) @' \
 		-e '/$$(MANDIR)/ s@$$(INSTALL) -m0644 @$$(BSD_INSTALL_MAN) @' \
 		-e 's@$$(INSTALL) -m0644 @$$(BSD_INSTALL_DATA) @' \
 		${WRKSRC}/Makefile
diff --git a/lang/chibi-scheme/distinfo b/lang/chibi-scheme/distinfo
index c82a9776da3b..700144182074 100644
--- a/lang/chibi-scheme/distinfo
+++ b/lang/chibi-scheme/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ashinn-chibi-scheme-0.7.3_GH0.tar.gz) = 821ce808573ca4eadfeb84bfd18d4ef839dde24ba882eb232207e48f89bb979b
-SIZE (ashinn-chibi-scheme-0.7.3_GH0.tar.gz) = 812703
+TIMESTAMP = 1518779134
+SHA256 (ashinn-chibi-scheme-0.8_GH0.tar.gz) = 8a077859b123216c123c243db391b0fe4c0cf73978c7cdd7b8ea853a48192756
+SIZE (ashinn-chibi-scheme-0.8_GH0.tar.gz) = 998430
diff --git a/lang/chibi-scheme/files/patch-Makefile.detect b/lang/chibi-scheme/files/patch-Makefile.detect
new file mode 100644
index 000000000000..0080994882da
--- /dev/null
+++ b/lang/chibi-scheme/files/patch-Makefile.detect
@@ -0,0 +1,10 @@
+--- Makefile.detect.orig	2018-02-16 11:08:45 UTC
++++ Makefile.detect
+@@ -70,6 +70,7 @@ EXE =
+ CLIBFLAGS = -fPIC
+ CLINKFLAGS = -shared
+ LIBDL = 
++LIBCHIBI_FLAGS = -Wl,-soname,libchibi-scheme$(SO).$(SOVERSION_MAJOR)
+ else
+ ifeq ($(PLATFORM),windows)
+ SO  = .dll
diff --git a/lang/chibi-scheme/pkg-plist b/lang/chibi-scheme/pkg-plist
index 11c584717442..e8ea35d24872 100644
--- a/lang/chibi-scheme/pkg-plist
+++ b/lang/chibi-scheme/pkg-plist
@@ -2,14 +2,17 @@ bin/chibi-doc
 bin/chibi-ffi
 bin/chibi-scheme
 bin/snow-chibi
+bin/snow-chibi.scm
 include/chibi/bignum.h
 include/chibi/eval.h
 include/chibi/features.h
+include/chibi/gc_heap.h
 include/chibi/install.h
 include/chibi/sexp.h
 lib/chibi/.chibi.meta
 lib/chibi/.scheme.meta
 lib/chibi/.srfi.meta
+lib/chibi/chibi/app-test.sld
 lib/chibi/chibi/app.scm
 lib/chibi/chibi/app.sld
 lib/chibi/chibi/ast.scm
@@ -18,8 +21,10 @@ lib/chibi/chibi/ast.so
 lib/chibi/chibi/base64-test.sld
 lib/chibi/chibi/base64.scm
 lib/chibi/chibi/base64.sld
+lib/chibi/chibi/binary-record-chicken.scm
 lib/chibi/chibi/binary-record.scm
 lib/chibi/chibi/binary-record.sld
+lib/chibi/chibi/binary-types.scm
 lib/chibi/chibi/bytevector.scm
 lib/chibi/chibi/bytevector.sld
 lib/chibi/chibi/channel.scm
@@ -82,6 +87,7 @@ lib/chibi/chibi/iset/iterators.scm
 lib/chibi/chibi/iset/iterators.sld
 lib/chibi/chibi/iset/optimize.scm
 lib/chibi/chibi/iset/optimize.sld
+lib/chibi/chibi/log-test.sld
 lib/chibi/chibi/log.scm
 lib/chibi/chibi/log.sld
 lib/chibi/chibi/loop-test.sld
@@ -116,6 +122,7 @@ lib/chibi/chibi/net/server.scm
 lib/chibi/chibi/net/server.sld
 lib/chibi/chibi/net/servlet.scm
 lib/chibi/chibi/net/servlet.sld
+lib/chibi/chibi/numeric-test.sld
 lib/chibi/chibi/optimize.scm
 lib/chibi/chibi/optimize.sld
 lib/chibi/chibi/optimize/profile.scm
@@ -138,6 +145,7 @@ lib/chibi/chibi/process-test.sld
 lib/chibi/chibi/process.scm
 lib/chibi/chibi/process.sld
 lib/chibi/chibi/process.so
+lib/chibi/chibi/quoted-printable-test.sld
 lib/chibi/chibi/quoted-printable.scm
 lib/chibi/chibi/quoted-printable.sld
 lib/chibi/chibi/regexp-test.sld
@@ -156,9 +164,18 @@ lib/chibi/chibi/show-test.sld
 lib/chibi/chibi/show.sld
 lib/chibi/chibi/show/base.scm
 lib/chibi/chibi/show/base.sld
+lib/chibi/chibi/show/c-test.sld
+lib/chibi/chibi/show/c.scm
+lib/chibi/chibi/show/c.sld
+lib/chibi/chibi/show/color.scm
+lib/chibi/chibi/show/color.sld
+lib/chibi/chibi/show/column.scm
+lib/chibi/chibi/show/column.sld
 lib/chibi/chibi/show/pretty.scm
 lib/chibi/chibi/show/pretty.sld
 lib/chibi/chibi/show/show.scm
+lib/chibi/chibi/show/unicode.scm
+lib/chibi/chibi/show/unicode.sld
 lib/chibi/chibi/show/write.scm
 lib/chibi/chibi/snow/commands.scm
 lib/chibi/chibi/snow/commands.sld
@@ -210,6 +227,7 @@ lib/chibi/chibi/zlib.sld
 lib/chibi/init-7.scm
 lib/chibi/meta-7.scm
 lib/chibi/scheme/base.sld
+lib/chibi/scheme/box.sld
 lib/chibi/scheme/case-lambda.sld
 lib/chibi/scheme/char.sld
 lib/chibi/scheme/char/ascii.scm
@@ -217,6 +235,8 @@ lib/chibi/scheme/char/case-offsets.scm
 lib/chibi/scheme/char/full.scm
 lib/chibi/scheme/char/normalization.sld
 lib/chibi/scheme/char/special-casing.scm
+lib/chibi/scheme/charset.sld
+lib/chibi/scheme/comparator.sld
 lib/chibi/scheme/complex.sld
 lib/chibi/scheme/cxr.scm
 lib/chibi/scheme/cxr.sld
@@ -224,54 +244,129 @@ lib/chibi/scheme/define-values.scm
 lib/chibi/scheme/digit-value.scm
 lib/chibi/scheme/division.scm
 lib/chibi/scheme/division.sld
+lib/chibi/scheme/ephemeron.sld
 lib/chibi/scheme/eval.sld
 lib/chibi/scheme/extras.scm
 lib/chibi/scheme/file.sld
+lib/chibi/scheme/generator.sld
+lib/chibi/scheme/hash-table.sld
+lib/chibi/scheme/ideque.sld
+lib/chibi/scheme/ilist.sld
 lib/chibi/scheme/inexact.scm
 lib/chibi/scheme/inexact.sld
 lib/chibi/scheme/lazy.sld
+lib/chibi/scheme/list-queue.sld
+lib/chibi/scheme/list.sld
 lib/chibi/scheme/load.sld
+lib/chibi/scheme/lseq.sld
 lib/chibi/scheme/misc-macros.scm
 lib/chibi/scheme/process-context.sld
 lib/chibi/scheme/r5rs.sld
 lib/chibi/scheme/read.sld
+lib/chibi/scheme/red.sld
 lib/chibi/scheme/repl.sld
+lib/chibi/scheme/rlist.sld
+lib/chibi/scheme/set.sld
 lib/chibi/scheme/small.sld
+lib/chibi/scheme/sort.sld
+lib/chibi/scheme/stream.sld
+lib/chibi/scheme/text.sld
 lib/chibi/scheme/time.sld
 lib/chibi/scheme/time.so
 lib/chibi/scheme/time/tai-to-utc-offset.sld
 lib/chibi/scheme/time/tai.sld
+lib/chibi/scheme/vector.sld
 lib/chibi/scheme/write.sld
 lib/chibi/srfi/1.sld
 lib/chibi/srfi/1/alists.scm
 lib/chibi/srfi/1/constructors.scm
 lib/chibi/srfi/1/deletion.scm
 lib/chibi/srfi/1/fold.scm
+lib/chibi/srfi/1/immutable.sld
 lib/chibi/srfi/1/lset.scm
 lib/chibi/srfi/1/misc.scm
 lib/chibi/srfi/1/predicates.scm
 lib/chibi/srfi/1/search.scm
 lib/chibi/srfi/1/selectors.scm
+lib/chibi/srfi/1/test.sld
+lib/chibi/srfi/101.scm
+lib/chibi/srfi/101.sld
 lib/chibi/srfi/11.sld
+lib/chibi/srfi/111.sld
+lib/chibi/srfi/113.sld
+lib/chibi/srfi/113/bags.scm
+lib/chibi/srfi/113/sets.scm
+lib/chibi/srfi/115.sld
+lib/chibi/srfi/116.sld
+lib/chibi/srfi/117.sld
+lib/chibi/srfi/117/queue.scm
+lib/chibi/srfi/121.sld
+lib/chibi/srfi/121/generators.scm
+lib/chibi/srfi/124.sld
+lib/chibi/srfi/125.sld
+lib/chibi/srfi/125/hash.scm
+lib/chibi/srfi/127.scm
+lib/chibi/srfi/127.sld
+lib/chibi/srfi/128.sld
+lib/chibi/srfi/128/comparators.scm
+lib/chibi/srfi/129.sld
+lib/chibi/srfi/129/titlecase.scm
+lib/chibi/srfi/129/titlemaps.scm
+lib/chibi/srfi/130.scm
+lib/chibi/srfi/130.sld
+lib/chibi/srfi/132.sld
+lib/chibi/srfi/132/sort.scm
+lib/chibi/srfi/133.sld
+lib/chibi/srfi/133/vector.scm
+lib/chibi/srfi/134.scm
+lib/chibi/srfi/134.sld
+lib/chibi/srfi/135.scm
+lib/chibi/srfi/135.sld
+lib/chibi/srfi/135/kernel8.body.scm
+lib/chibi/srfi/135/kernel8.sld
+lib/chibi/srfi/135/test.sld
+lib/chibi/srfi/139.scm
+lib/chibi/srfi/139.sld
+lib/chibi/srfi/14.sld
+lib/chibi/srfi/141.sld
+lib/chibi/srfi/142.sld
+lib/chibi/srfi/143.sld
+lib/chibi/srfi/143/fixnum.scm
+lib/chibi/srfi/144.sld
+lib/chibi/srfi/144/flonum.scm
+lib/chibi/srfi/144/math.so
+lib/chibi/srfi/145.sld
+lib/chibi/srfi/147.sld
+lib/chibi/srfi/151.sld
+lib/chibi/srfi/151/bit.so
+lib/chibi/srfi/151/bitwise.scm
+lib/chibi/srfi/154.scm
+lib/chibi/srfi/154.sld
+lib/chibi/srfi/159.sld
+lib/chibi/srfi/159/base.sld
+lib/chibi/srfi/159/color.sld
+lib/chibi/srfi/159/columnar.sld
+lib/chibi/srfi/159/unicode.sld
 lib/chibi/srfi/16.sld
 lib/chibi/srfi/18.sld
 lib/chibi/srfi/18/interface.scm
 lib/chibi/srfi/18/threads.so
 lib/chibi/srfi/18/types.scm
 lib/chibi/srfi/2.sld
+lib/chibi/srfi/23.sld
 lib/chibi/srfi/26.sld
 lib/chibi/srfi/27.sld
 lib/chibi/srfi/27/constructors.scm
 lib/chibi/srfi/27/rand.so
 lib/chibi/srfi/33.sld
-lib/chibi/srfi/33/bit.so
-lib/chibi/srfi/33/bitwise.scm
 lib/chibi/srfi/38.scm
 lib/chibi/srfi/38.sld
 lib/chibi/srfi/39.sld
 lib/chibi/srfi/39/param.so
 lib/chibi/srfi/39/syntax-no-threads.scm
 lib/chibi/srfi/39/syntax.scm
+lib/chibi/srfi/41.scm
+lib/chibi/srfi/41.sld
 lib/chibi/srfi/46.sld
 lib/chibi/srfi/55.sld
 lib/chibi/srfi/6.sld
@@ -299,7 +394,7 @@ lib/chibi/srfi/99/test.sld
 lib/libchibi-scheme.a
 lib/libchibi-scheme.so
 lib/libchibi-scheme.so.0
-lib/libchibi-scheme.so.0.7.3
+lib/libchibi-scheme.so.0.8.0
 libdata/pkgconfig/chibi-scheme.pc
 man/man1/chibi-doc.1.gz
 man/man1/chibi-ffi.1.gz