- Update to 0.5.9

- Add diff to remove ldconfig, which is GNU/Linux compatible
- Add diff to explicitly check for threaded Boehm GC to avoid breaking when
  both threaded, and non-threaded versions are installed

5 files changed, 70 insertions, 4 deletions

diff --git a/lang/sagittarius-scheme/Makefile b/lang/sagittarius-scheme/Makefile
index 270f156..9d74a4e 100644
--- a/lang/sagittarius-scheme/Makefile
+++ b/lang/sagittarius-scheme/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sagittarius
-PORTVERSION=	0.5.7
-PORTREVISION=	1
+PORTVERSION=	0.5.9
 CATEGORIES=	lang
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
 		${MASTER_SITE_LOCAL}
@@ -20,6 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libffi.pc:${PORTSDIR}/devel/libffi
 LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi \
 		libgc-threaded.so:${PORTSDIR}/devel/boehm-gc-threaded
 
+USE_LDCONFIG=	yes
 USES=		cmake gmake
 ONLY_FOR_ARCHS=	amd64 i386
 MAKE_JOBS_UNSAFE=	yes
diff --git a/lang/sagittarius-scheme/distinfo b/lang/sagittarius-scheme/distinfo
index 549e102..953d394 100644
--- a/lang/sagittarius-scheme/distinfo
+++ b/lang/sagittarius-scheme/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sagittarius-0.5.7.tar.gz) = 03a8b6410cdde772c4f78d4bab832f339eb11e34eba531fa4ac856f195f9b0b2
-SIZE (sagittarius-0.5.7.tar.gz) = 5952332
+SHA256 (sagittarius-0.5.9.tar.gz) = 2c07ed97096f2e45f08dafbb8dc7528bcef0571404b5fecd36c72c4242827d74
+SIZE (sagittarius-0.5.9.tar.gz) = 6002151
diff --git a/lang/sagittarius-scheme/files/patch-cmake_CMakeLists.txt b/lang/sagittarius-scheme/files/patch-cmake_CMakeLists.txt
new file mode 100644
index 0000000..2b3e6ba
--- /dev/null
+++ b/lang/sagittarius-scheme/files/patch-cmake_CMakeLists.txt
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- cmake/CMakeLists.txt.orig
++++ cmake/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # Post install script
+ 
+ # running ldconfig
+-INSTALL(CODE "MESSAGE(STATUS \"Running ldconfig\")")
+-INSTALL(CODE "execute_process(COMMAND ldconfig)")
++#INSTALL(CODE "MESSAGE(STATUS \"Running ldconfig\")")
++#INSTALL(CODE "execute_process(COMMAND ldconfig)")
diff --git a/lang/sagittarius-scheme/files/patch-cmake_FindGC.cmake b/lang/sagittarius-scheme/files/patch-cmake_FindGC.cmake
new file mode 100644
index 0000000..f26c665
--- /dev/null
+++ b/lang/sagittarius-scheme/files/patch-cmake_FindGC.cmake
@@ -0,0 +1,40 @@
+
+$FreeBSD$
+
+--- cmake/FindGC.cmake.orig
++++ cmake/FindGC.cmake
+@@ -55,9 +55,9 @@
+   # then use it
+   INCLUDE(${CMAKE_ROOT}/Modules/CheckCSourceCompiles.cmake)
+   # not sure if this links properly...
+-  FIND_LIBRARY(BOEHM_GC_LIBRARIES NAMES gc
++  FIND_LIBRARY(BOEHM_GC_LIBRARIES NAMES gc-threaded
+     HINTS ${PC_BDW_GC_LIBDIR} ${PC_BDW_GC_LIBRARY_DIRS})
+-  SET(CMAKE_REQUIRED_LIBRARIES "gc")
++  SET(CMAKE_REQUIRED_LIBRARIES "gc-threaded")
+   SET(CMAKE_REQUIRED_DEFINITIONS "-DGC_THREADS")
+   SET(CMAKE_REQUIRED_INCLUDES "${BOEHM_GC_INCLUDE_DIR}")
+   SET(CMAKE_REQUIRED_FLAGS "-L${PC_BDW_GC_LIBRARY_DIRS}")
+@@ -69,22 +69,6 @@
+ return 0;
+ }
+ " GC_GET_PARALLEL_WORKS)
+-  IF (NOT GC_GET_PARALLEL_WORKS)
+-    MESSAGE(STATUS "Try gc-threaded")
+-    SET(CMAKE_REQUIRED_LIBRARIES "gc-threaded")
+-    SET(CMAKE_REQUIRED_DEFINITIONS "-DGC_THREADS")
+-    SET(CMAKE_REQUIRED_INCLUDES "${BOEHM_GC_INCLUDE_DIR}")
+-    SET(CMAKE_REQUIRED_FLAGS "-L${PC_BDW_GC_LIBRARY_DIRS}")
+-    FIND_LIBRARY(BOEHM_GC_LIBRARIES NAMES gc-threaded
+-      HINTS ${PC_BDW_GC_LIBDIR} ${PC_BDW_GC_LIBRARY_DIRS})
+-    CHECK_C_SOURCE_RUNS(
+-      "#include <gc.h>
+-int main() {
+-int i=GC_get_parallel();
+-return 0;
+-}
+-" GC_GET_THREADED_PARALLEL_WORKS)
+-  ENDIF()
+ ELSE()
+   FIND_LIBRARY(BOEHM_GC_LIBRARIES NAMES gc
+     HINTS ${PC_BDW_GC_LIBDIR} ${PC_BDW_GC_LIBRARY_DIRS})
diff --git a/lang/sagittarius-scheme/pkg-plist b/lang/sagittarius-scheme/pkg-plist
index 1512e93..494fae6 100644
--- a/lang/sagittarius-scheme/pkg-plist
+++ b/lang/sagittarius-scheme/pkg-plist
@@ -104,6 +104,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/lib/crypto/pkcs.scm
 %%ODBC%%%%DATADIR%%/%%PORTVERSION%%/lib/dbd/odbc.scm
 %%DATADIR%%/%%PORTVERSION%%/lib/math.scm
+%%DATADIR%%/%%PORTVERSION%%/lib/math/ec.scm
 %%DATADIR%%/%%PORTVERSION%%/lib/math/hash.scm
 %%DATADIR%%/%%PORTVERSION%%/lib/math/helper.scm
 %%DATADIR%%/%%PORTVERSION%%/lib/math/prime.scm
@@ -207,7 +208,15 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/lalr.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/match.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/math/mt-random.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/amqp.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/amqp/api.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/amqp/messaging.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/mqtt.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/mqtt/broker.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/mqtt/broker/api.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/mqtt/client.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/mqtt/packet.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/mqtt/topic.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/amqp/transport.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/mq/amqp/types.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/oauth.scm
@@ -219,6 +228,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/oauth/request-adapter.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/oauth/signature.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/oauth/token.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/net/server.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/packrat.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/pp.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/rfc/%3a5322.scm
@@ -424,6 +434,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/markdown/convert.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/markdown/parser.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/parse.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/text/sql.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/sre.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/sxml/helper.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/text/sxml/html.scm
@@ -442,6 +453,8 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/tlv.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/trace.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/bytevector.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/util/concurrent.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/util/concurrent/executor.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/deque.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/file.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/hashtables.scm