- Update to 0.8.8

- Remove upstream-ed diff

4 files changed, 15 insertions, 73 deletions

diff --git a/lang/sagittarius-scheme/Makefile b/lang/sagittarius-scheme/Makefile
index be422d744ce4..795793149214 100644
--- a/lang/sagittarius-scheme/Makefile
+++ b/lang/sagittarius-scheme/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sagittarius
-PORTVERSION=	0.8.7
+PORTVERSION=	0.8.8
 CATEGORIES=	lang
 MASTER_SITES=	https://bitbucket.org/ktakashi/sagittarius-scheme/downloads/ \
 		LOCAL/ashish
@@ -45,7 +45,7 @@ PLIST_SUB+=	PLIST_ARCH=${PLIST_ARCH}
 
 pre-configure:
 	@${CC} ${CFLAGS} -o ${WRKDIR}/cpuid ${FILESDIR}/cpuid.c
-	@${REINPLACE_CMD} -e 's,%%CPUID%%,${WRKDIR}/cpuid,' ${WRKSRC}/cmake/FindSSE.cmake
+	@${REINPLACE_CMD} -e 's,cpuid,${WRKDIR}/cpuid,' ${WRKSRC}/cmake/FindSSE.cmake
 
 post-patch-ODBC-off:
 	@${REINPLACE_CMD} -e '/odbc odbc/d' ${WRKSRC}/ext/CMakeLists.txt
diff --git a/lang/sagittarius-scheme/distinfo b/lang/sagittarius-scheme/distinfo
index e39177818c59..83a723766745 100644
--- a/lang/sagittarius-scheme/distinfo
+++ b/lang/sagittarius-scheme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506920792
-SHA256 (sagittarius-0.8.7.tar.gz) = a7dbca62879c88b89b335557f781ecb98f584ea0e86d3b7a3f4dc649dbbc7b79
-SIZE (sagittarius-0.8.7.tar.gz) = 6798931
+TIMESTAMP = 1511445333
+SHA256 (sagittarius-0.8.8.tar.gz) = 92ea2de648789e672eed62485a3604a09f35696608d529db2a05f6dd859b28a6
+SIZE (sagittarius-0.8.8.tar.gz) = 6823953
diff --git a/lang/sagittarius-scheme/files/patch-cmake_FindSSE.cmake b/lang/sagittarius-scheme/files/patch-cmake_FindSSE.cmake
deleted file mode 100644
index 0ca7520895a1..000000000000
--- a/lang/sagittarius-scheme/files/patch-cmake_FindSSE.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
---- cmake/FindSSE.cmake.orig	2017-09-23 20:35:38 UTC
-+++ cmake/FindSSE.cmake
-@@ -5,6 +5,7 @@
- MACRO (FindSSE)
-   # SSE is only for x86 and relatives
-   IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i.86" OR
-+     CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" OR
-      CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-    IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CYGWIN)
-      EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO)
-@@ -122,6 +123,57 @@ MACRO (FindSSE)
-      set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
-      set(SSE4_2_FOUND false CACHE BOOL "SSE4.2 available on host")
-      set(AVX_FOUND    false CACHE BOOL "AVX available on host")
-+
-+   ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-+     EXEC_PROGRAM(%%CPUID%% OUTPUT_VARIABLE CPUINFO)
-+
-+     STRING(REGEX REPLACE "^.*,(SSE2).*$" "\\1" SSE_THERE ${CPUINFO})
-+     STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE)
-+     IF (SSE2_TRUE)
-+       set(SSE2_FOUND true CACHE BOOL "SSE2 available on host")
-+     ELSE (SSE2_TRUE)
-+       set(SSE2_FOUND false CACHE BOOL "SSE2 available on host")
-+     ENDIF (SSE2_TRUE)
-+
-+     STRING(REGEX REPLACE "^.*<(SSE3).*$" "\\1" SSE_THERE ${CPUINFO})
-+     STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE)
-+
-+     STRING(REGEX REPLACE "^.*,(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO})
-+     STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE)
-+     IF (SSE3_TRUE OR SSSE3_TRUE)
-+       set(SSE3_FOUND true CACHE BOOL "SSE3 available on host")
-+     ELSE (SSE3_TRUE OR SSSE3_TRUE)
-+       set(SSE3_FOUND false CACHE BOOL "SSE3 available on host")
-+     ENDIF (SSE3_TRUE OR SSSE3_TRUE)
-+     IF (SSSE3_TRUE)
-+       set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host")
-+     ELSE (SSSE3_TRUE)
-+       set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host")
-+     ENDIF (SSSE3_TRUE)
-+
-+     STRING(REGEX REPLACE "^.*,(SSE4\\.1).*$" "\\1" SSE_THERE ${CPUINFO})
-+     STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE)
-+     IF (SSE41_TRUE)
-+       set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host")
-+     ELSE (SSE41_TRUE)
-+       set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
-+     ENDIF (SSE41_TRUE)
-+
-+     STRING(REGEX REPLACE "^.*,(SSE4\\.2).*$" "\\1" SSE_THERE ${CPUINFO})
-+     STRING(COMPARE EQUAL "SSE4.2" "${SSE_THERE}" SSE42_TRUE)
-+     IF (SSE42_TRUE)
-+       set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host")
-+     ELSE (SSE42_TRUE)
-+       set(SSE4_2_FOUND false CACHE BOOL "SSE4.2 available on host")
-+     ENDIF (SSE42_TRUE)
-+
-+     STRING(REGEX REPLACE "^.*,(AVX).*$" "\\1" SSE_THERE ${CPUINFO})
-+     STRING(COMPARE EQUAL "AVX" "${SSE_THERE}" AVX_TRUE)
-+     IF (AVX_TRUE)
-+       set(AVX_FOUND true CACHE BOOL "AVX available on host")
-+     ELSE (AVX_TRUE)
-+       set(AVX_FOUND false CACHE BOOL "AVX available on host")
-+     ENDIF (AVX_TRUE)
-    ELSE()
-      set(SSE2_FOUND   true  CACHE BOOL "SSE2 available on host")
-      set(SSE3_FOUND   false CACHE BOOL "SSE3 available on host")
diff --git a/lang/sagittarius-scheme/pkg-plist b/lang/sagittarius-scheme/pkg-plist
index 2c87cf016976..5ac976c9a628 100644
--- a/lang/sagittarius-scheme/pkg-plist
+++ b/lang/sagittarius-scheme/pkg-plist
@@ -318,7 +318,11 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/oauth/signature.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/oauth/token.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/net/server.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/net/server/monitor.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/packrat.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/peg.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/peg/derived.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/peg/primitives.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/pp.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/rfc/%3a5322.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/rfc/base64.scm
@@ -405,6 +409,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/cgen/type.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/cgen/unit.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/char-set/boundary.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/combinators.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/control.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/conditions.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/debug.scm
@@ -413,6 +418,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/interactive/support.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/io.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/misc.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/mock.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/partcont.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/reader.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/%%PORTNAME%%/record.scm
@@ -550,6 +556,8 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a145/assumptions.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a151.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a151/bitwise.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a158.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a158/generators-and-accumulators.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a17.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a17/generalized-set!.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/%3a2.scm
@@ -656,6 +664,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/144.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/145.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/151.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/158.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/17.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/2.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/srfi/23.scm
@@ -726,6 +735,7 @@ libdata/pkgconfig/%%PORTNAME%%.pc
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/buffer.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/bytevector.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/concurrent.scm
+%%DATADIR%%/%%PORTVERSION%%/sitelib/util/concurrent/actor.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/concurrent/executor.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/concurrent/future.scm
 %%DATADIR%%/%%PORTVERSION%%/sitelib/util/concurrent/shared-queue.scm