- Update to 0.6.1

- Correct LICENSE information

4 files changed, 89 insertions, 19 deletions

diff --git a/lang/sagittarius-scheme/Makefile b/lang/sagittarius-scheme/Makefile
index 9d74a4eac9d1..8153feb7218b 100644
--- a/lang/sagittarius-scheme/Makefile
+++ b/lang/sagittarius-scheme/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sagittarius
-PORTVERSION=	0.5.9
+PORTVERSION=	0.6.1
 CATEGORIES=	lang
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
 		${MASTER_SITE_LOCAL}
@@ -12,8 +12,8 @@ PKGNAMESUFFIX=	-scheme
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	R6RS/R7RS Scheme system
 
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/Copyright
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libffi.pc:${PORTSDIR}/devel/libffi
 LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi \
@@ -31,6 +31,7 @@ CMAKE_ARGS+=	-DINSTALL_PREFIX=${PREFIX}
 PLIST_SUB=	PORTNAME=sagittarius PORTVERSION=${PORTVERSION}
 
 ODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+ODBC_CMAKE_ON=		-DODBC_INCLUDE_DIR:STRING=${LOCALBASE}/include/libiodbc
 OPTIONS_SUB=		ODBC
 
 .include <bsd.port.options.mk>
diff --git a/lang/sagittarius-scheme/distinfo b/lang/sagittarius-scheme/distinfo
index 953d39419aeb..067d2b5d5f03 100644
--- a/lang/sagittarius-scheme/distinfo
+++ b/lang/sagittarius-scheme/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sagittarius-0.5.9.tar.gz) = 2c07ed97096f2e45f08dafbb8dc7528bcef0571404b5fecd36c72c4242827d74
-SIZE (sagittarius-0.5.9.tar.gz) = 6002151
+SHA256 (sagittarius-0.6.1.tar.gz) = 57d15f90f3e0083e5cacfc6647934e30c20e1bd0a5a735e8512e78f4969d9211
+SIZE (sagittarius-0.6.1.tar.gz) = 6039440
diff --git a/lang/sagittarius-scheme/files/patch-CMakeLists.txt b/lang/sagittarius-scheme/files/patch-CMakeLists.txt
index 2fe66e305dd1..c990b2c247b4 100644
--- a/lang/sagittarius-scheme/files/patch-CMakeLists.txt
+++ b/lang/sagittarius-scheme/files/patch-CMakeLists.txt
@@ -3,15 +3,12 @@ $FreeBSD$
 
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -494,9 +494,9 @@
-   CONFIGURE_FILE(cmake/sagittarius.pc.in
-     ${PROJECT_BINARY_DIR}/sagittarius-${SAGITTARIUS_VERSION}.pc @ONLY)
-   INSTALL(FILES ${PROJECT_BINARY_DIR}/sagittarius.pc
--    DESTINATION lib/pkgconfig)
-+    DESTINATION libdata/pkgconfig)
-   INSTALL(FILES ${PROJECT_BINARY_DIR}/sagittarius-${SAGITTARIUS_VERSION}.pc
--    DESTINATION lib/pkgconfig)
-+    DESTINATION libdata/pkgconfig)
- ENDIF()
+@@ -30,7 +30,7 @@
+ GET_PARAMETER(SHARE_DIR      share)
+ # FreeBSD ports adds a patch for this directory
+ # so make it configurable
+-GET_PARAMETER(PKGCONFIG_DIR  lib/pkgconfig)
++GET_PARAMETER(PKGCONFIG_DIR  libdata/pkgconfig)
  
- # config, package so on
+ if (WATCOM)
+   message(STATUS "*CAUTION* open watcom is experimental")
diff --git a/lang/sagittarius-scheme/pkg-plist b/lang/sagittarius-scheme/pkg-plist
index d67d8ebf30cf..4b29029fc2f8 100644
--- a/lang/sagittarius-scheme/pkg-plist
+++ b/lang/sagittarius-scheme/pkg-plist
@@ -2,6 +2,59 @@ bin/%%PORTNAME%%-config
 bin/%%PORTNAME%%-package
 bin/%%PORTNAME%%
 bin/sash
+include/%%PORTNAME%%.h
+include/%%PORTNAME%%/arith.h
+include/%%PORTNAME%%/bignum.h
+include/%%PORTNAME%%/bits.h
+include/%%PORTNAME%%/builtin-keywords.h
+include/%%PORTNAME%%/builtin-symbols.h
+include/%%PORTNAME%%/bytevector.h
+include/%%PORTNAME%%/cache.h
+include/%%PORTNAME%%/charset.h
+include/%%PORTNAME%%/clos.h
+include/%%PORTNAME%%/closure.h
+include/%%PORTNAME%%/code.h
+include/%%PORTNAME%%/codec.h
+include/%%PORTNAME%%/collection.h
+include/%%PORTNAME%%/compare.h
+include/%%PORTNAME%%/config.h
+include/%%PORTNAME%%/core.h
+include/%%PORTNAME%%/error.h
+include/%%PORTNAME%%/exceptions.h
+include/%%PORTNAME%%/extend.h
+include/%%PORTNAME%%/file.h
+include/%%PORTNAME%%/generic.h
+include/%%PORTNAME%%/gloc.h
+include/%%PORTNAME%%/hashtable.h
+include/%%PORTNAME%%/identifier.h
+include/%%PORTNAME%%/instruction.h
+include/%%PORTNAME%%/keyword.h
+include/%%PORTNAME%%/library.h
+include/%%PORTNAME%%/load.h
+include/%%PORTNAME%%/macro.h
+include/%%PORTNAME%%/number.h
+include/%%PORTNAME%%/numconst.h
+include/%%PORTNAME%%/pair.h
+include/%%PORTNAME%%/port.h
+include/%%PORTNAME%%/profiler.h
+include/%%PORTNAME%%/reader.h
+include/%%PORTNAME%%/record.h
+include/%%PORTNAME%%/regex.h
+include/%%PORTNAME%%/%%PORTNAME%%defs.h
+include/%%PORTNAME%%/string.h
+include/%%PORTNAME%%/subr.h
+include/%%PORTNAME%%/symbol.h
+include/%%PORTNAME%%/system.h
+include/%%PORTNAME%%/thread.h
+include/%%PORTNAME%%/transcoder.h
+include/%%PORTNAME%%/treemap.h
+include/%%PORTNAME%%/unicode.h
+include/%%PORTNAME%%/values.h
+include/%%PORTNAME%%/vector.h
+include/%%PORTNAME%%/vm.h
+include/%%PORTNAME%%/weak.h
+include/%%PORTNAME%%/win-compat.h
+include/%%PORTNAME%%/writer.h
 lib/lib%%PORTNAME%%.so
 lib/%%PORTNAME%%/%%PORTVERSION%%/include/%%PORTNAME%%.h
 lib/%%PORTNAME%%/%%PORTVERSION%%/include/%%PORTNAME%%/arith.h
@@ -57,6 +110,7 @@ lib/%%PORTNAME%%/%%PORTVERSION%%/include/%%PORTNAME%%/weak.h
 lib/%%PORTNAME%%/%%PORTVERSION%%/include/%%PORTNAME%%/win-compat.h
 lib/%%PORTNAME%%/%%PORTVERSION%%/include/%%PORTNAME%%/writer.h
 lib/%%PORTNAME%%/%%PORTVERSION%%/%%PLIST_ARCH%%-pc-freebsd/lib%%PORTNAME%%.so
+lib/%%PORTNAME%%/%%PORTVERSION%%/%%PLIST_ARCH%%-pc-freebsd/sash
 lib/%%PORTNAME%%/%%PORTVERSION%%/%%PLIST_ARCH%%-pc-freebsd/%%PORTNAME%%--crypto.so
 lib/%%PORTNAME%%/%%PORTVERSION%%/%%PLIST_ARCH%%-pc-freebsd/%%PORTNAME%%--ffi.so
 lib/%%PORTNAME%%/%%PORTVERSION%%/%%PLIST_ARCH%%-pc-freebsd/%%PORTNAME%%--math.so
@@ -137,6 +191,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/lib/rnrs/sorting.scm
 %%DATADIR%%/%%PORTVERSION%%/lib/rnrs/syntax-case.scm
 %%DATADIR%%/%%PORTVERSION%%/lib/rnrs/unicode.scm
+%%DATADIR%%/%%PORTVERSION%%/lib/%%PORTNAME%%/comparators.scm
 %%DATADIR%%/%%PORTVERSION%%/lib/%%PORTNAME%%/crypto.scm
 %%DATADIR%%/%%PORTVERSION%%/lib/%%PORTNAME%%/dynamic-module.scm
 %%DATADIR%%/%%PORTVERSION%%/lib/%%PORTNAME%%/ffi.scm
@@ -205,7 +260,6 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/encoding/util.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/getopt.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/json.scm
-%%DATADIR%%/%%PORTVERSION%%/sitelib/lalr.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/match.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/math/mt-random.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/amqp.scm
@@ -331,12 +385,16 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a111/boxes.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a112.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a112/inquiry.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a113.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a113/sets.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a114.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a114/comparators.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a115.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a115/regexp.scm
-%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/114.scm
-%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/115.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a116.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a116/ilists.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a117.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a117/list-queues.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a13.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a13/strings.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a14.scm
@@ -382,8 +440,12 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a5/let.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a6.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a6/basic-string-ports.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a60.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a60/integer-bits.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a64.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a64/testing.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a69.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a69/basic-hash-tables.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a78.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a78/lightweight-testing.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a8.scm
@@ -400,6 +462,11 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/110.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/111.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/112.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/113.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/114.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/115.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/116.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/117.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/13.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/14.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/17.scm
@@ -421,7 +488,9 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/49.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/5.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/6.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/60.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/64.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/69.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/78.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/8.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/86.scm
@@ -430,6 +499,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/sweet.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/csv.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/html-lite.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/text/json.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/markdown.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/markdown/convert.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/markdown/parser.scm
@@ -438,6 +508,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/sre.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/sxml/helper.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/sxml/html.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/text/sxml/html-parser.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/sxml/htmlprag.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/sxml/private/to-html-ext.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/sxml/private/to-html.scm
@@ -463,6 +534,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/port.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/queue.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/sparse.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/util/timer.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/treemap.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/www/cgi.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/www/fastcgi.scm