diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2019-06-27 09:02:56 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2019-06-27 09:02:56 +0000 |
| commit | 3186e08e7cdddac0929decce6bf1d991d8812181 (patch) | |
| tree | 9b00b47306733fd0c753d6a412fb12557feb9478 | |
| parent | 58b12aeafce3467eea6235b9aeffe218cdf4d8e0 (diff) | |
Update Guile to version 2.2.5, modern stable version, and fix dependent
ports to build against it. Most changes are rather minor and mechanical
except for the devel/gdb (obtained via their bugtracker [1], courtesy of
Doug Evans). One port (science/meep) I had to mark BROKEN after fixing
it proved to be very tedious and actually unreliable. It is very old,
there are newer versions available so it should be fixed by updating.
One port (devel/libruin) had revealed a bug in the new Guile code (an
auxiliary script, really) that had to be worked-round; reference to the
problematic upstream commit is provided in the patch.
PR: 229613
Exp-run by: antoine
[1] https://sourceware.org/bugzilla/show_bug.cgi?id=21104#c8
Notes
Notes:
svn path=/head/; revision=505200
33 files changed, 1217 insertions, 394 deletions
diff --git a/cad/lepton-eda/Makefile b/cad/lepton-eda/Makefile index 1adebe66485b..8f450e57336a 100644 --- a/cad/lepton-eda/Makefile +++ b/cad/lepton-eda/Makefile @@ -2,6 +2,7 @@ PORTNAME= lepton-eda PORTVERSION= 1.9.7 +PORTREVISION= 1 DISTVERSIONSUFFIX= -20181211 CATEGORIES= cad @@ -13,7 +14,7 @@ LICENSE= GPLv2+ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgc-threaded.so:devel/boehm-gc-threaded \ - libguile-2.0.so:lang/guile2 \ + libguile-2.2.so:lang/guile2 \ libpng.so:graphics/png \ libstroke.so:devel/libstroke @@ -52,18 +53,20 @@ OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime +post-patch: + @${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \ + ${WRKSRC}/m4/geda-guile.m4 + # work around for errors while running # build-tools/icon-theme-installer: # # Cannot find 'install -m 0644'; You probably want to pass -x ${INSTALL_DATA} # -# -# NOTE: in the error message above (I wanted to show it -# verbatim), INSTALL_DATA actually is enclosed in -# parenthesis, not in curly brackets. -# I had to change it to appease portlint(1), which does -# not ignore comments in makefiles. -# +# NOTE: in the error message above (I wanted to show it +# verbatim), INSTALL_DATA actually is enclosed in +# parenthesis, not in curly brackets. +# I had to change it to appease portlint(1), which does +# not ignore comments in makefiles. # # for 3 dirs (attrib/data, liblepton/data, schematic/data) # the following lines should be in the generated Makefile: diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile index 2e5d3c3fb929..919ce7931a83 100644 --- a/devel/autogen/Makefile +++ b/devel/autogen/Makefile @@ -3,6 +3,7 @@ PORTNAME= autogen PORTVERSION= 5.18.16 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNU/${PORTNAME}/rel${PORTVERSION} @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${RUN_DEPENDS} \ gmktemp:sysutils/coreutils -LIB_DEPENDS= libguile-2.0.so:lang/guile2 +LIB_DEPENDS= libguile-2.2.so:lang/guile2 RUN_DEPENDS= bash:shells/bash # bin/columns diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 9868c7129747..036d916a16ce 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -3,7 +3,7 @@ PORTNAME= gdb PORTVERSION= 8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNU @@ -80,7 +80,8 @@ BUNDLED_READLINE_CONFIGURE_OFF= --with-system-readline DEBUG_CFLAGS= -g GUILE_CONFIGURE_WITH= guile GUILE_USES= pkgconfig -GUILE_LIB_DEPENDS= libguile-2.0.so:lang/guile2 +GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 +GUILE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-guile22 NLS_USES= gettext-runtime PORT_READLINE_USES= readline:port PORT_ICONV_USES= iconv:wchar_t diff --git a/devel/gdb/files/extrapatch-guile22 b/devel/gdb/files/extrapatch-guile22 new file mode 100644 index 000000000000..f488e20cf5e0 --- /dev/null +++ b/devel/gdb/files/extrapatch-guile22 @@ -0,0 +1,717 @@ +2018-01-21 Doug Evans <dje@google.com> + + PR guile/21104 + * configure.ac: Add guile-2.2 back. + * configure: Regenerate. + * guile/scm-ports.c (PORTS_V22): New macro. + (ioscm_memory_port) [!PORTS_V22]: Make read_buf_size,write_buf_size + !PORTS_V22 only. + (port_type_t): New type. + (stdio_port_type): Renamed from stdio_port_desc. + (stdio_port_type_name): Renamed from stdio_port_desc_name. + (memory_port_type): Renamed from memory_port_desc. + (memmory_port_type_name): Renamed from memory_port_desc_name. + (natural_buf_size) [PORTS_V22]: New variable. + (ioscm_open_port): New argument stream. All callers updated. + (ioscm_read, ioscm_write) [PORTS_V22]: New functions. + (ioscm_init_gdb_stdio_port) [PORTS_V22]: Adapt for use in Guile >= 2.2. + (gdbscm_is_stdio_port): New function. + (gdbscm_stdio_port_p): Call it. + (gdbscm_get_natural_buffer_sizes, gdbscm_memory_port_seek) + (gdbscm_memory_port_read, gdbscm_memory_port_write) [PORTS_V22]: New + functions. + (gdbscm_memory_port_print): Adapt for use in Guile >= 2.2. + (ioscm_init_memory_port_type): Ditto. + (ioscm_init_memory_stream): Replaces ioscm_init_memory_port. + (ioscm_init_memory_port_buffers): New function. + (gdbscm_open_memory): Update. + (gdbscm_is_memory_port): Adapt for use in Guile >= 2.2. + (port_functions) [!PORTS_V22]: Only define Guile functions + memory-port-read-buffer-size, set-memory-port-read-buffer-size!, + memory-port-write-buffer-size, set-memory-port-write-buffer-size! + for Guile < 2.2. + (gdbscm_initialize_ports): Only initialize out_of_range_buf_size if + !PORTS_V22. + +--- gdb/configure.orig 2019-06-26 13:50:46 UTC ++++ gdb/configure +@@ -10985,7 +10985,7 @@ fi + + + +-try_guile_versions="guile-2.0" ++try_guile_versions="guile-2.0 guile-2.2" + have_libguile=no + case "${with_guile}" in + no) +--- gdb/guile/scm-ports.c.orig 2019-05-11 18:19:03 UTC ++++ gdb/guile/scm-ports.c +@@ -36,6 +36,13 @@ + #endif + #endif + ++/* Guile ports radically changed in Guile 2.2. ++ Note: We don't support Guile < 2.0. ++ TODO(dje): Suggest deprecating and then removing Guile 2.0 support ++ at some point in the future. */ ++#define PORTS_V22 (SCM_MAJOR_VERSION > 2 \ ++ || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION >= 2) ++ + /* A ui-file for sending output to Guile. */ + + class ioscm_file_port : public ui_file +@@ -66,12 +73,14 @@ typedef struct + This value is always in the range [0, size]. */ + ULONGEST current; + ++#if !PORTS_V22 + /* The size of the internal r/w buffers. + Scheme ports aren't a straightforward mapping to memory r/w. + Generally the user specifies how much to r/w and all access is + unbuffered. We don't try to provide equivalent access, but we allow + the user to specify these values to help get something similar. */ + unsigned read_buf_size, write_buf_size; ++#endif + } ioscm_memory_port; + + /* Copies of the original system input/output/error ports. +@@ -80,11 +89,17 @@ static SCM orig_input_port_scm; + static SCM orig_output_port_scm; + static SCM orig_error_port_scm; + +-/* This is the stdio port descriptor, scm_ptob_descriptor. */ +-static scm_t_bits stdio_port_desc; ++#if PORTS_V22 ++typedef scm_t_port_type *port_type_t; ++#else ++typedef scm_t_bits port_type_t; ++#endif + ++/* This is the stdio port type. */ ++static port_type_t stdio_port_type; ++ + /* Note: scm_make_port_type takes a char * instead of a const char *. */ +-static /*const*/ char stdio_port_desc_name[] = "gdb:stdio-port"; ++static /*const*/ char stdio_port_type_name[] = "gdb:stdio-port"; + + /* Names of each gdb port. */ + static const char input_port_name[] = "gdb:stdin"; +@@ -101,12 +116,19 @@ static SCM error_port_scm; + /* Internal enum for specifying output port. */ + enum oport { GDB_STDOUT, GDB_STDERR }; + +-/* This is the memory port descriptor, scm_ptob_descriptor. */ +-static scm_t_bits memory_port_desc; ++/* This is the memory port type. */ ++static port_type_t memory_port_type; + + /* Note: scm_make_port_type takes a char * instead of a const char *. */ +-static /*const*/ char memory_port_desc_name[] = "gdb:memory-port"; ++static /*const*/ char memory_port_type_name[] = "gdb:memory-port"; + ++#if PORTS_V22 ++ ++/* The maximum values to use for get_natural_buffer_sizes. */ ++static const unsigned natural_buf_size = 16; ++ ++#else ++ + /* The default amount of memory to fetch for each read/write request. + Scheme ports don't provide a way to specify the size of a read, + which is important to us to minimize the number of inferior interactions, +@@ -120,6 +142,8 @@ static const unsigned default_write_buf_size = 16; + static const unsigned min_memory_port_buf_size = 1; + static const unsigned max_memory_port_buf_size = 4096; + ++#endif ++ + /* "out of range" error message for buf sizes. */ + static char *out_of_range_buf_size; + +@@ -132,7 +156,7 @@ static SCM size_keyword; + Newer versions of Guile (2.1.x) have scm_c_make_port. */ + + static SCM +-ioscm_open_port (scm_t_bits port_type, long mode_bits) ++ioscm_open_port (port_type_t port_type, long mode_bits, scm_t_bits stream) + { + SCM port; + +@@ -140,9 +164,12 @@ ioscm_open_port (scm_t_bits port_type, long mode_bits) + scm_i_scm_pthread_mutex_lock (&scm_i_port_table_mutex); + #endif + ++#if PORTS_V22 ++ port = scm_c_make_port (port_type, mode_bits, stream); ++#else + port = scm_new_port_table_entry (port_type); +- + SCM_SET_CELL_TYPE (port, port_type | mode_bits); ++#endif + + #if 0 /* TODO: Guile doesn't export this. What to do? */ + scm_i_pthread_mutex_unlock (&scm_i_port_table_mutex); +@@ -150,6 +177,23 @@ ioscm_open_port (scm_t_bits port_type, long mode_bits) + + return port; + } ++ ++/* Like fputstrn_filtered, but don't escape characters, except nul. ++ Also like fputs_filtered, but a length is specified. */ ++ ++static void ++fputsn_filtered (const char *s, size_t size, struct ui_file *stream) ++{ ++ size_t i; ++ ++ for (i = 0; i < size; ++i) ++ { ++ if (s[i] == '\0') ++ fputs_filtered ("\\000", stream); ++ else ++ fputc_filtered (s[i], stream); ++ } ++} + + /* Support for connecting Guile's stdio ports to GDB's stdio ports. */ + +@@ -218,6 +262,73 @@ ioscm_input_waiting (SCM port) + } + } + ++#if PORTS_V22 ++ ++static size_t ++ioscm_read (SCM port, SCM dst, size_t start, size_t count) ++{ ++ /* Borrowed from libguile/fports.c. */ ++ auto ptr = reinterpret_cast<char*>(SCM_BYTEVECTOR_CONTENTS (dst) + start); ++ ssize_t ret; ++ ++ /* If we're called on stdout,stderr, punt. */ ++ if (! scm_is_eq (port, input_port_scm)) ++ return 0; /* EOF */ ++ ++ gdb_flush (gdb_stdout); ++ gdb_flush (gdb_stderr); ++ ++ retry: ++ ret = ui_file_read (gdb_stdin, ptr, count); ++ if (ret < 0) ++ { ++ if (errno == EINTR) ++ { ++ scm_async_tick (); ++ goto retry; ++ } ++ if (errno == EWOULDBLOCK || errno == EAGAIN) ++ { ++ /* See the discussion of non-blocking I/O in the Guile manual. */ ++ return -1; ++ } ++ scm_syserror ("ioscm_read"); ++ } ++ return ret; ++} ++ ++static size_t ++ioscm_write (SCM port, SCM src, size_t start, size_t count) ++{ ++ /* Borrowed from libguile/fports.c. */ ++ auto ptr = reinterpret_cast<char*>(SCM_BYTEVECTOR_CONTENTS (src) + start); ++ ssize_t ret; ++ ++ /* If we're called on stdin, punt. */ ++ if (scm_is_eq (port, input_port_scm)) ++ { ++ errno = EIO; ++ scm_syserror("ioscm_write"); ++ } ++ ++ TRY ++ { ++ if (scm_is_eq (port, error_port_scm)) ++ fputsn_filtered (ptr, count, gdb_stderr); ++ else ++ fputsn_filtered (ptr, count, gdb_stdout); ++ } ++ CATCH (except, RETURN_MASK_ALL) ++ { ++ GDBSCM_HANDLE_GDB_EXCEPTION (except); ++ } ++ END_CATCH ++ ++ return count; ++} ++ ++#else /* !PORTS_V22 */ ++ + /* The scm_t_ptob_descriptor.fill_input "method". */ + + static int +@@ -245,23 +356,6 @@ ioscm_fill_input (SCM port) + return *pt->read_buf; + } + +-/* Like fputstrn_filtered, but don't escape characters, except nul. +- Also like fputs_filtered, but a length is specified. */ +- +-static void +-fputsn_filtered (const char *s, size_t size, struct ui_file *stream) +-{ +- size_t i; +- +- for (i = 0; i < size; ++i) +- { +- if (s[i] == '\0') +- fputs_filtered ("\\000", stream); +- else +- fputc_filtered (s[i], stream); +- } +-} +- + /* Write to gdb's stdout or stderr. */ + + static void +@@ -301,6 +395,8 @@ ioscm_flush (SCM port) + gdb_flush (gdb_stdout); + } + ++#endif ++ + /* Initialize the gdb stdio port type. + + N.B. isatty? will fail on these ports, it is only supported for file +@@ -309,13 +405,23 @@ ioscm_flush (SCM port) + static void + ioscm_init_gdb_stdio_port (void) + { +- stdio_port_desc = scm_make_port_type (stdio_port_desc_name, +- ioscm_fill_input, ioscm_write); ++ stdio_port_type = scm_make_port_type (stdio_port_type_name, ++#if PORTS_V22 ++ ioscm_read, ++#else ++ ioscm_fill_input, ++#endif ++ ioscm_write); + +- scm_set_port_input_waiting (stdio_port_desc, ioscm_input_waiting); +- scm_set_port_flush (stdio_port_desc, ioscm_flush); ++ scm_set_port_input_waiting (stdio_port_type, ioscm_input_waiting); ++ ++#if !PORTS_V22 ++ scm_set_port_flush (stdio_port_type, ioscm_flush); ++#endif + } + ++#if !PORTS_V22 ++ + /* Subroutine of ioscm_make_gdb_stdio_port to simplify it. + Set up the buffers of port PORT. + MODE_BITS are the mode bits of PORT. */ +@@ -358,6 +464,8 @@ ioscm_init_stdio_buffers (SCM port, long mode_bits) + pt->write_end = pt->write_buf + pt->write_buf_size; + } + ++#endif ++ + /* Create a gdb stdio port. */ + + static SCM +@@ -388,23 +496,36 @@ ioscm_make_gdb_stdio_port (int fd) + } + + mode_bits = scm_mode_bits ((char *) mode_str); +- port = ioscm_open_port (stdio_port_desc, mode_bits); ++ port = ioscm_open_port (stdio_port_type, mode_bits, 0); + + scm_set_port_filename_x (port, gdbscm_scm_from_c_string (name)); + ++#if !PORTS_V22 + ioscm_init_stdio_buffers (port, mode_bits); ++#endif + + return port; + } + ++/* Return non-zero if OBJ is a stdio port. */ ++ ++static int ++gdbscm_is_stdio_port (SCM obj) ++{ ++ /* This is copied from SCM_FPORTP. */ ++#if PORTS_V22 ++ return SCM_PORTP (obj) && SCM_PORT_TYPE (obj) == stdio_port_type; ++#else ++ return !SCM_IMP (obj) && SCM_TYP16 (obj) == stdio_port_type; ++#endif ++} ++ + /* (stdio-port? object) -> boolean */ + + static SCM +-gdbscm_stdio_port_p (SCM scm) ++gdbscm_stdio_port_p (SCM obj) + { +- /* This is copied from SCM_FPORTP. */ +- return scm_from_bool (!SCM_IMP (scm) +- && (SCM_TYP16 (scm) == stdio_port_desc)); ++ return scm_from_bool (gdbscm_is_stdio_port (obj)); + } + + /* GDB's ports are accessed via functions to keep them read-only. */ +@@ -567,6 +688,94 @@ ioscm_lseek_address (ioscm_memory_port *iomem, LONGEST + return 1; + } + ++#if PORTS_V22 ++ ++/* The semantics get weird if the buffer size is larger than the port range, ++ so provide a better default buffer size. */ ++ ++static void ++gdbscm_get_natural_buffer_sizes (SCM port, size_t *read_size, ++ size_t *write_size) ++{ ++ ioscm_memory_port *iomem = (ioscm_memory_port *) SCM_STREAM (port); ++ ++ size_t size = natural_buf_size; ++ if (iomem->size < size) ++ size = iomem->size; ++ *read_size = *write_size = size; ++} ++ ++static scm_t_off ++gdbscm_memory_port_seek (SCM port, scm_t_off offset, int whence) ++{ ++ ioscm_memory_port *iomem = (ioscm_memory_port *) SCM_STREAM (port); ++ scm_t_off result; ++ int rc; ++ ++ if (ioscm_lseek_address (iomem, offset, whence) == 0) ++ { ++ gdbscm_out_of_range_error (FUNC_NAME, 0, ++ gdbscm_scm_from_longest (offset), ++ _("bad seek")); ++ } ++ ++ return iomem->current; ++} ++ ++static size_t ++gdbscm_memory_port_read (SCM port, SCM dst, size_t start, size_t count) ++{ ++ /* Borrowed from libguile/fports.c. */ ++ auto ptr = reinterpret_cast<gdb_byte*>(SCM_BYTEVECTOR_CONTENTS (dst) + start); ++ ioscm_memory_port *iomem = (ioscm_memory_port *) SCM_STREAM (port); ++ size_t to_read; ++ ++ /* "current" is the offset of the first byte we want to read. */ ++ gdb_assert (iomem->current <= iomem->size); ++ if (iomem->current == iomem->size) ++ return 0; /* EOF */ ++ ++ /* Don't read outside the allowed memory range. */ ++ to_read = count; ++ if (to_read > iomem->size - iomem->current) ++ to_read = iomem->size - iomem->current; ++ ++ if (target_read_memory (iomem->start + iomem->current, ptr, to_read) != 0) ++ gdbscm_memory_error (FUNC_NAME, _("error reading memory"), SCM_EOL); ++ ++ iomem->current += to_read; ++ return to_read; ++} ++ ++static size_t ++gdbscm_memory_port_write (SCM port, SCM src, size_t start, size_t count) ++{ ++ /* Borrowed from libguile/fports.c. */ ++ auto ptr = reinterpret_cast<const gdb_byte*>(SCM_BYTEVECTOR_CONTENTS (src) + ++ start); ++ ioscm_memory_port *iomem = (ioscm_memory_port *) SCM_STREAM (port); ++ ssize_t ret; ++ ++ /* "current" is the offset of the first byte we want to read. */ ++ gdb_assert (iomem->current <= iomem->size); ++ ++ /* There's no way to indicate a short write, so if the request goes past ++ the end of the port's memory range, flag an error. */ ++ if (count > iomem->size - iomem->current) ++ { ++ gdbscm_out_of_range_error (FUNC_NAME, 0, gdbscm_scm_from_ulongest (count), ++ _("writing beyond end of memory range")); ++ } ++ ++ if (target_write_memory (iomem->start + iomem->current, ptr, count) != 0) ++ gdbscm_memory_error (FUNC_NAME, _("error writing memory"), SCM_EOL); ++ iomem->current += count; ++ ++ return count; ++} ++ ++#else /* !PORTS_V22 */ ++ + /* "fill_input" method for memory ports. */ + + static int +@@ -850,18 +1059,19 @@ gdbscm_memory_port_free (SCM port) + return 0; + } + ++#endif ++ + /* "print" method for memory ports. */ + + static int + gdbscm_memory_port_print (SCM exp, SCM port, scm_print_state *pstate) + { + ioscm_memory_port *iomem = (ioscm_memory_port *) SCM_STREAM (exp); +- char *type = SCM_PTOBNAME (SCM_PTOBNUM (exp)); + + scm_puts ("#<", port); + scm_print_port_mode (exp, port); + /* scm_print_port_mode includes a trailing space. */ +- gdbscm_printf (port, "%s %s-%s", type, ++ gdbscm_printf (port, "%s %s-%s", memory_port_type_name, + hex_string (iomem->start), hex_string (iomem->end)); + scm_putc ('>', port); + return 1; +@@ -872,16 +1082,25 @@ gdbscm_memory_port_print (SCM exp, SCM port, scm_print + static void + ioscm_init_memory_port_type (void) + { +- memory_port_desc = scm_make_port_type (memory_port_desc_name, ++ memory_port_type = scm_make_port_type (memory_port_type_name, ++#if PORTS_V22 ++ gdbscm_memory_port_read, ++#else + gdbscm_memory_port_fill_input, ++#endif + gdbscm_memory_port_write); + +- scm_set_port_end_input (memory_port_desc, gdbscm_memory_port_end_input); +- scm_set_port_flush (memory_port_desc, gdbscm_memory_port_flush); +- scm_set_port_seek (memory_port_desc, gdbscm_memory_port_seek); +- scm_set_port_close (memory_port_desc, gdbscm_memory_port_close); +- scm_set_port_free (memory_port_desc, gdbscm_memory_port_free); +- scm_set_port_print (memory_port_desc, gdbscm_memory_port_print); ++#if PORTS_V22 ++ scm_set_port_get_natural_buffer_sizes (memory_port_type, ++ gdbscm_get_natural_buffer_sizes); ++#else ++ scm_set_port_end_input (memory_port_type, gdbscm_memory_port_end_input); ++ scm_set_port_flush (memory_port_type, gdbscm_memory_port_flush); ++ scm_set_port_free (memory_port_type, gdbscm_memory_port_free); ++ scm_set_port_close (memory_port_type, gdbscm_memory_port_close); ++#endif ++ scm_set_port_seek (memory_port_type, gdbscm_memory_port_seek); ++ scm_set_port_print (memory_port_type, gdbscm_memory_port_print); + } + + /* Helper for gdbscm_open_memory to parse the mode bits. +@@ -921,27 +1140,20 @@ ioscm_parse_mode_bits (const char *func_name, const ch + return mode_bits; + } + +-/* Helper for gdbscm_open_memory to finish initializing the port. +- The port has address range [start,end). +- This means that address of 0xff..ff is not accessible. +- I can live with that. */ +- +-static void +-ioscm_init_memory_port (SCM port, CORE_ADDR start, CORE_ADDR end) ++static scm_t_bits ++ioscm_init_memory_stream (bool buffered, CORE_ADDR start, CORE_ADDR end) + { +- scm_t_port *pt; +- ioscm_memory_port *iomem; +- int buffered = (SCM_CELL_WORD_0 (port) & SCM_BUF0) == 0; ++ auto iomem = reinterpret_cast<ioscm_memory_port *>( ++ scm_gc_malloc_pointerless (sizeof (ioscm_memory_port), "memory port")); + + gdb_assert (start <= end); + +- iomem = (ioscm_memory_port *) scm_gc_malloc_pointerless (sizeof (*iomem), +- "memory port"); +- + iomem->start = start; + iomem->end = end; + iomem->size = end - start; + iomem->current = 0; ++ ++#if !PORTS_V22 + if (buffered) + { + iomem->read_buf_size = default_read_buf_size; +@@ -952,7 +1164,25 @@ ioscm_init_memory_port (SCM port, CORE_ADDR start, COR + iomem->read_buf_size = 1; + iomem->write_buf_size = 1; + } ++#endif + ++ return reinterpret_cast<scm_t_bits>(iomem); ++} ++ ++#if !PORTS_V22 ++ ++/* Helper for gdbscm_open_memory to finish initializing the port. ++ The port has address range [start,end). ++ This means that address of 0xff..ff is not accessible. ++ I can live with that. */ ++ ++static void ++ioscm_init_memory_port_buffers (SCM port) ++{ ++ scm_t_port *pt; ++ auto iomem = reinterpret_cast<const ioscm_memory_port *>(SCM_STREAM (port)); ++ bool buffered = (SCM_CELL_WORD_0 (port) & SCM_BUF0) == 0; ++ + pt = SCM_PTAB_ENTRY (port); + /* Match the expectation of `binary-port?'. */ + pt->encoding = NULL; +@@ -972,8 +1202,6 @@ ioscm_init_memory_port (SCM port, CORE_ADDR start, COR + pt->read_pos = pt->read_end = pt->read_buf; + pt->write_pos = pt->write_buf; + pt->write_end = pt->write_buf + pt->write_buf_size; +- +- SCM_SETSTREAM (port, iomem); + } + + /* Re-initialize a memory port, updating its read/write buffer sizes. +@@ -1041,6 +1269,8 @@ ioscm_reinit_memory_port (SCM port, size_t read_buf_si + } + } + ++#endif /* !PORTS_V22 */ ++ + /* (open-memory [#:mode string] [#:start address] [#:size integer]) -> port + Return a port that can be used for reading and writing memory. + MODE is a string, and must be one of "r", "w", or "r+". +@@ -1107,10 +1337,19 @@ gdbscm_open_memory (SCM rest) + end = ~(CORE_ADDR) 0; + + mode_bits = ioscm_parse_mode_bits (FUNC_NAME, mode); ++ /* Edge case: empty range -> unbuffered. ++ There's no need to disallow empty ranges, but we need an unbuffered port ++ to get the semantics right. */ ++ if (size == 0) ++ mode_bits |= SCM_BUF0; + +- port = ioscm_open_port (memory_port_desc, mode_bits); ++ bool buffered = (mode_bits & SCM_BUF0) == 0; ++ auto stream = ioscm_init_memory_stream(buffered, start, end); ++ port = ioscm_open_port (memory_port_type, mode_bits, stream); + +- ioscm_init_memory_port (port, start, end); ++#if !PORTS_V22 ++ ioscm_init_memory_port_buffers (port); ++#endif + + scm_dynwind_end (); + +@@ -1123,7 +1362,12 @@ gdbscm_open_memory (SCM rest) + static int + gdbscm_is_memory_port (SCM obj) + { +- return !SCM_IMP (obj) && (SCM_TYP16 (obj) == memory_port_desc); ++ /* This is copied from SCM_FPORTP. */ ++#if PORTS_V22 ++ return SCM_PORTP (obj) && SCM_PORT_TYPE (obj) == memory_port_type; ++#else ++ return !SCM_IMP (obj) && SCM_TYP16 (obj) == memory_port_type; ++#endif + } + + /* (memory-port? obj) -> boolean */ +@@ -1142,13 +1386,15 @@ gdbscm_memory_port_range (SCM port) + ioscm_memory_port *iomem; + + SCM_ASSERT_TYPE (gdbscm_is_memory_port (port), port, SCM_ARG1, FUNC_NAME, +- memory_port_desc_name); ++ memory_port_type_name); + + iomem = (ioscm_memory_port *) SCM_STREAM (port); + return scm_list_2 (gdbscm_scm_from_ulongest (iomem->start), + gdbscm_scm_from_ulongest (iomem->end)); + } + ++#if !PORTS_V22 ++ + /* (memory-port-read-buffer-size port) -> integer */ + + static SCM +@@ -1157,7 +1403,7 @@ gdbscm_memory_port_read_buffer_size (SCM port) + ioscm_memory_port *iomem; + + SCM_ASSERT_TYPE (gdbscm_is_memory_port (port), port, SCM_ARG1, FUNC_NAME, +- memory_port_desc_name); ++ memory_port_type_name); + + iomem = (ioscm_memory_port *) SCM_STREAM (port); + return scm_from_uint (iomem->read_buf_size); +@@ -1173,7 +1419,7 @@ gdbscm_set_memory_port_read_buffer_size_x (SCM port, S + ioscm_memory_port *iomem; + + SCM_ASSERT_TYPE (gdbscm_is_memory_port (port), port, SCM_ARG1, FUNC_NAME, +- memory_port_desc_name); ++ memory_port_type_name); + SCM_ASSERT_TYPE (scm_is_integer (size), size, SCM_ARG2, FUNC_NAME, + _("integer")); + +@@ -1199,7 +1445,7 @@ gdbscm_memory_port_write_buffer_size (SCM port) + ioscm_memory_port *iomem; + + SCM_ASSERT_TYPE (gdbscm_is_memory_port (port), port, SCM_ARG1, FUNC_NAME, +- memory_port_desc_name); ++ memory_port_type_name); + + iomem = (ioscm_memory_port *) SCM_STREAM (port); + return scm_from_uint (iomem->write_buf_size); +@@ -1215,7 +1461,7 @@ gdbscm_set_memory_port_write_buffer_size_x (SCM port, + ioscm_memory_port *iomem; + + SCM_ASSERT_TYPE (gdbscm_is_memory_port (port), port, SCM_ARG1, FUNC_NAME, +- memory_port_desc_name); ++ memory_port_type_name); + SCM_ASSERT_TYPE (scm_is_integer (size), size, SCM_ARG2, FUNC_NAME, + _("integer")); + +@@ -1232,6 +1478,8 @@ gdbscm_set_memory_port_write_buffer_size_x (SCM port, + + return SCM_UNSPECIFIED; + } ++ ++#endif /* !PORTS_V22 */ + + /* Initialize gdb ports. */ + +@@ -1268,6 +1516,7 @@ Return #t if the object is a memory port." }, + "\ + Return the memory range of the port as (start end)." }, + ++#if !PORTS_V22 + { "memory-port-read-buffer-size", 1, 0, 0, + as_a_scm_t_subr (gdbscm_memory_port_read_buffer_size), + "\ +@@ -1293,6 +1542,7 @@ Set the size of the write buffer for the memory port.\ + \n\ + Arguments: port integer\n\ + Returns: unspecified." }, ++#endif + + END_FUNCTIONS + }; +@@ -1365,9 +1615,11 @@ gdbscm_initialize_ports (void) + start_keyword = scm_from_latin1_keyword ("start"); + size_keyword = scm_from_latin1_keyword ("size"); + ++#if !PORTS_V22 + /* Error message text for "out of range" memory port buffer sizes. */ + + out_of_range_buf_size = xstrprintf ("size not between %u - %u", + min_memory_port_buf_size, + max_memory_port_buf_size); ++#endif + } diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile index f7ac149488bf..473939b09b7f 100644 --- a/devel/guile-lib/Makefile +++ b/devel/guile-lib/Makefile @@ -3,7 +3,7 @@ PORTNAME= guile-lib PORTVERSION= 0.2.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel scheme MASTER_SITES= SAVANNAH diff --git a/devel/guile-lib/pkg-plist b/devel/guile-lib/pkg-plist index 99ea34f5ff37..17e390e3b663 100644 --- a/devel/guile-lib/pkg-plist +++ b/devel/guile-lib/pkg-plist @@ -1,33 +1,33 @@ -lib/guile-lib/guile/2.0/site-ccache/apicheck.go -lib/guile-lib/guile/2.0/site-ccache/compat/guile-2.go -lib/guile-lib/guile/2.0/site-ccache/config/load.go -lib/guile-lib/guile/2.0/site-ccache/container/async-queue.go -lib/guile-lib/guile/2.0/site-ccache/container/delay-tree.go -lib/guile-lib/guile/2.0/site-ccache/container/nodal-tree.go -lib/guile-lib/guile/2.0/site-ccache/debugging/assert.go -lib/guile-lib/guile/2.0/site-ccache/debugging/time.go -lib/guile-lib/guile/2.0/site-ccache/graph/topological-sort.go -lib/guile-lib/guile/2.0/site-ccache/htmlprag.go -lib/guile-lib/guile/2.0/site-ccache/io/string.go -lib/guile-lib/guile/2.0/site-ccache/logging/logger.go -lib/guile-lib/guile/2.0/site-ccache/logging/port-log.go -lib/guile-lib/guile/2.0/site-ccache/logging/rotating-log.go -lib/guile-lib/guile/2.0/site-ccache/match-bind.go -lib/guile-lib/guile/2.0/site-ccache/math/minima.go -lib/guile-lib/guile/2.0/site-ccache/math/primes.go -lib/guile-lib/guile/2.0/site-ccache/md5.go -lib/guile-lib/guile/2.0/site-ccache/os/process.go -lib/guile-lib/guile/2.0/site-ccache/scheme/documentation.go -lib/guile-lib/guile/2.0/site-ccache/scheme/kwargs.go -lib/guile-lib/guile/2.0/site-ccache/search/basic.go -lib/guile-lib/guile/2.0/site-ccache/string/completion.go -lib/guile-lib/guile/2.0/site-ccache/string/soundex.go -lib/guile-lib/guile/2.0/site-ccache/string/transform.go -lib/guile-lib/guile/2.0/site-ccache/string/wrap.go -lib/guile-lib/guile/2.0/site-ccache/term/ansi-color.go -lib/guile-lib/guile/2.0/site-ccache/texinfo/nodal-tree.go -lib/guile-lib/guile/2.0/site-ccache/text/parse-lalr.go -lib/guile-lib/guile/2.0/site-ccache/unit-test.go +lib/guile-lib/guile/2.2/site-ccache/apicheck.go +lib/guile-lib/guile/2.2/site-ccache/compat/guile-2.go +lib/guile-lib/guile/2.2/site-ccache/config/load.go +lib/guile-lib/guile/2.2/site-ccache/container/async-queue.go +lib/guile-lib/guile/2.2/site-ccache/container/delay-tree.go +lib/guile-lib/guile/2.2/site-ccache/container/nodal-tree.go +lib/guile-lib/guile/2.2/site-ccache/debugging/assert.go +lib/guile-lib/guile/2.2/site-ccache/debugging/time.go +lib/guile-lib/guile/2.2/site-ccache/graph/topological-sort.go +lib/guile-lib/guile/2.2/site-ccache/htmlprag.go +lib/guile-lib/guile/2.2/site-ccache/io/string.go +lib/guile-lib/guile/2.2/site-ccache/logging/logger.go +lib/guile-lib/guile/2.2/site-ccache/logging/port-log.go +lib/guile-lib/guile/2.2/site-ccache/logging/rotating-log.go +lib/guile-lib/guile/2.2/site-ccache/match-bind.go +lib/guile-lib/guile/2.2/site-ccache/math/minima.go +lib/guile-lib/guile/2.2/site-ccache/math/primes.go +lib/guile-lib/guile/2.2/site-ccache/md5.go +lib/guile-lib/guile/2.2/site-ccache/os/process.go +lib/guile-lib/guile/2.2/site-ccache/scheme/documentation.go +lib/guile-lib/guile/2.2/site-ccache/scheme/kwargs.go +lib/guile-lib/guile/2.2/site-ccache/search/basic.go +lib/guile-lib/guile/2.2/site-ccache/string/completion.go +lib/guile-lib/guile/2.2/site-ccache/string/soundex.go +lib/guile-lib/guile/2.2/site-ccache/string/transform.go +lib/guile-lib/guile/2.2/site-ccache/string/wrap.go +lib/guile-lib/guile/2.2/site-ccache/term/ansi-color.go +lib/guile-lib/guile/2.2/site-ccache/texinfo/nodal-tree.go +lib/guile-lib/guile/2.2/site-ccache/text/parse-lalr.go +lib/guile-lib/guile/2.2/site-ccache/unit-test.go libdata/pkgconfig/guile-lib-1.0.pc %%DATADIR%%/apicheck.scm %%DATADIR%%/compat/guile-2.scm diff --git a/devel/libruin/Makefile b/devel/libruin/Makefile index c5f5db0a14f0..5939754bb2a3 100644 --- a/devel/libruin/Makefile +++ b/devel/libruin/Makefile @@ -3,7 +3,7 @@ PORTNAME= libruin PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel scheme MASTER_SITES= SAVANNAH @@ -17,7 +17,7 @@ NOT_FOR_ARCHS= mips NOT_FOR_ARCHS_REASON= glib needs gcc7(Not available for mips) BUILD_DEPENDS= guile-lib>0:devel/guile-lib -LIB_DEPENDS= libguile-2.0.so:lang/guile2 \ +LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ libgc-threaded.so:devel/boehm-gc-threaded RUN_DEPENDS= guile-lib>0:devel/guile-lib @@ -34,6 +34,14 @@ OPTIONS_DEFINE= DOCS EXAMPLES PORTDOCS= ChangeLog PORTEXAMPLES= css21-conformance-uris.txt ruinview.c +post-patch: +# XXX: must remove spaces from the PACKAGE_STRING because of this: +# http://git.savannah.gnu.org/cgit/guile.git/commit/libguile/guile-snarf.in?id=f775ab3654357fcaad294b95efb0b1c16de1eda8 (yes, it's a bug in the new guile) + @${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \ + -e '/^PACKAGE_STRING=/s, ,-,' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,@appendixsubsec,@appendixsec,' \ + ${WRKSRC}/doc/fdl.texi + post-configure: # Avoid compiling examples, which fails to compile # As the examples needs the library to be already installed diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 830ea9824b06..5d8a1d37a0ab 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnucash PORTVERSION= 3.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} @@ -19,7 +19,7 @@ LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring \ libfreetype.so:print/freetype2 \ libsecret-1.so:security/libsecret \ libsoup-2.4.so:devel/libsoup \ - libguile-2.0.so:lang/guile2 \ + libguile-2.2.so:lang/guile2 \ libgc-threaded.so:devel/boehm-gc-threaded \ libboost_date_time.so:devel/boost-libs \ libicudata.so:devel/icu diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist index e97eacbe5640..094461951652 100644 --- a/finance/gnucash/pkg-plist +++ b/finance/gnucash/pkg-plist @@ -251,152 +251,152 @@ lib/gnucash/libgncmod-report-gnome.so lib/gnucash/libgncmod-report-system.so lib/gnucash/libgncmod-stylesheets.so lib/gnucash/libgncmod-tax-us.so -lib/gnucash/scm/ccache/2.0/business-options.go -lib/gnucash/scm/ccache/2.0/business-prefs.go -lib/gnucash/scm/ccache/2.0/c-interface.go -lib/gnucash/scm/ccache/2.0/commodity-table.go -lib/gnucash/scm/ccache/2.0/commodity-utilities.go -lib/gnucash/scm/ccache/2.0/date-utilities.go -lib/gnucash/scm/ccache/2.0/engine-interface.go -lib/gnucash/scm/ccache/2.0/engine-utilities.go -lib/gnucash/scm/ccache/2.0/fin.go -lib/gnucash/scm/ccache/2.0/gnc-menu-extensions.go -lib/gnucash/scm/ccache/2.0/gnc-numeric.go -lib/gnucash/scm/ccache/2.0/gnucash/app-utils.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/baz.go -lib/gnucash/scm/ccache/2.0/gnucash/business-core.go -lib/gnucash/scm/ccache/2.0/gnucash/core-utils.go -lib/gnucash/scm/ccache/2.0/gnucash/engine.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/engine/test/srfi64-extras.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/engine/test/test-extras.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/foo.go -lib/gnucash/scm/ccache/2.0/gnucash/gettext.go -lib/gnucash/scm/ccache/2.0/gnucash/gnc-module.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-load-deps.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-load-scm.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-scm-dynload.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-scm-init.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-scm-module.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-scm-multi.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-swigged-c.go -lib/gnucash/scm/ccache/2.0/gnucash/gnome-utils.go -lib/gnucash/scm/ccache/2.0/gnucash/import-export/qif-import.go -lib/gnucash/scm/ccache/2.0/gnucash/import-export/string.go -lib/gnucash/scm/ccache/2.0/gnucash/price-quotes.go -lib/gnucash/scm/ccache/2.0/gnucash/report/aging.go -lib/gnucash/scm/ccache/2.0/gnucash/report/balsheet-eg.go -lib/gnucash/scm/ccache/2.0/gnucash/report/business-reports.go -lib/gnucash/scm/ccache/2.0/gnucash/report/customer-summary.go -lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-gnc.go -lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-html-utilities.go -lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-utilities.go -lib/gnucash/scm/ccache/2.0/gnucash/report/hello-world.go -lib/gnucash/scm/ccache/2.0/gnucash/report/invoice.go -lib/gnucash/scm/ccache/2.0/gnucash/report/job-report.go -lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/de_DE.go -lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/us.go -lib/gnucash/scm/ccache/2.0/gnucash/report/owner-report.go -lib/gnucash/scm/ccache/2.0/gnucash/report/payables.go -lib/gnucash/scm/ccache/2.0/gnucash/report/receipt.go -lib/gnucash/scm/ccache/2.0/gnucash/report/receivables.go -lib/gnucash/scm/ccache/2.0/gnucash/report/report-gnome.go -lib/gnucash/scm/ccache/2.0/gnucash/report/report-system.go -lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/collectors.go -lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/report-collectors.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-extras.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-load-report-system-module.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-test-extras.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-piecharts.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-summary.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/advanced-portfolio.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/average-balance.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/balance-forecast.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/balance-sheet.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-balance-sheet.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-barchart.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-flow.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-income-statement.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/cash-flow.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/cashflow-barchart.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/category-barchart.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/daily-reports.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/equity-statement.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-journal.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-ledger.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/income-gst-statement.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/income-statement.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-charts.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/portfolio.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/price-scatter.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/register.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/sx-summary.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-cash-flow.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/transaction.go -lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/trial-balance.go -lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-easy.go -lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-fancy.go -lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-footer.go -lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-head-or-tail.go -lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-plain.go -lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheets.go -lib/gnucash/scm/ccache/2.0/gnucash/report/taxinvoice.go -lib/gnucash/scm/ccache/2.0/gnucash/report/taxtxf-de_DE.go -lib/gnucash/scm/ccache/2.0/gnucash/report/taxtxf.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/test-load-report-stylesheets-module.go -lib/gnucash/scm/ccache/2.0/gnucash/report/utility-reports.go -lib/gnucash/scm/ccache/2.0/gnucash/report/view-column.go -lib/gnucash/scm/ccache/2.0/gnucash/report/welcome-to-gnucash.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/reports/test-load-app-utils-module.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/reports/test-load-gnome-utils-module.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/reports/test-load-report-gnome-module.go -lib/gnucash/scm/ccache/2.0/gnucash/tax/de_DE.go -lib/gnucash/scm/ccache/2.0/gnucash/tax/us.go -%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/unittest-support.go -lib/gnucash/scm/ccache/2.0/gnucash/utilities.go -lib/gnucash/scm/ccache/2.0/hooks.go -lib/gnucash/scm/ccache/2.0/html-acct-table.go -lib/gnucash/scm/ccache/2.0/html-anytag.go -lib/gnucash/scm/ccache/2.0/html-barchart.go -lib/gnucash/scm/ccache/2.0/html-document.go -lib/gnucash/scm/ccache/2.0/html-fonts.go -lib/gnucash/scm/ccache/2.0/html-linechart.go -lib/gnucash/scm/ccache/2.0/html-piechart.go -lib/gnucash/scm/ccache/2.0/html-scatter.go -lib/gnucash/scm/ccache/2.0/html-style-info.go -lib/gnucash/scm/ccache/2.0/html-style-sheet.go -lib/gnucash/scm/ccache/2.0/html-table.go -lib/gnucash/scm/ccache/2.0/html-text.go -lib/gnucash/scm/ccache/2.0/html-utilities.go -lib/gnucash/scm/ccache/2.0/json.go -lib/gnucash/scm/ccache/2.0/json/builder.go -lib/gnucash/scm/ccache/2.0/json/parser.go -lib/gnucash/scm/ccache/2.0/json/syntax.go -lib/gnucash/scm/ccache/2.0/migrate-prefs.go -lib/gnucash/scm/ccache/2.0/options-utilities.go -lib/gnucash/scm/ccache/2.0/options.go -lib/gnucash/scm/ccache/2.0/prefs.go -lib/gnucash/scm/ccache/2.0/qif-import/qif-dialog-utils.go -lib/gnucash/scm/ccache/2.0/qif-import/qif-file.go -lib/gnucash/scm/ccache/2.0/qif-import/qif-guess-map.go -lib/gnucash/scm/ccache/2.0/qif-import/qif-import.go -lib/gnucash/scm/ccache/2.0/qif-import/qif-merge-groups.go -lib/gnucash/scm/ccache/2.0/qif-import/qif-objects.go -lib/gnucash/scm/ccache/2.0/qif-import/qif-parse.go -lib/gnucash/scm/ccache/2.0/qif-import/qif-to-gnc.go -lib/gnucash/scm/ccache/2.0/qif-import/qif-utils.go -lib/gnucash/scm/ccache/2.0/report-utilities.go -lib/gnucash/scm/ccache/2.0/report.go -lib/gnucash/scm/ccache/2.0/simple-obj.go -%%TEST%%lib/gnucash/scm/ccache/2.0/test-account.go -%%TEST%%lib/gnucash/scm/ccache/2.0/test-c-interface.go -%%TEST%%lib/gnucash/scm/ccache/2.0/test-create-account.go -%%TEST%%lib/gnucash/scm/ccache/2.0/test-split.go -lib/gnucash/scm/ccache/2.0/txf-de_DE.go -lib/gnucash/scm/ccache/2.0/txf-help-de_DE.go -lib/gnucash/scm/ccache/2.0/txf-help.go -lib/gnucash/scm/ccache/2.0/txf.go +lib/gnucash/scm/ccache/2.2/business-options.go +lib/gnucash/scm/ccache/2.2/business-prefs.go +lib/gnucash/scm/ccache/2.2/c-interface.go +lib/gnucash/scm/ccache/2.2/commodity-table.go +lib/gnucash/scm/ccache/2.2/commodity-utilities.go +lib/gnucash/scm/ccache/2.2/date-utilities.go +lib/gnucash/scm/ccache/2.2/engine-interface.go +lib/gnucash/scm/ccache/2.2/engine-utilities.go +lib/gnucash/scm/ccache/2.2/fin.go +lib/gnucash/scm/ccache/2.2/gnc-menu-extensions.go +lib/gnucash/scm/ccache/2.2/gnc-numeric.go +lib/gnucash/scm/ccache/2.2/gnucash/app-utils.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/baz.go +lib/gnucash/scm/ccache/2.2/gnucash/business-core.go +lib/gnucash/scm/ccache/2.2/gnucash/core-utils.go +lib/gnucash/scm/ccache/2.2/gnucash/engine.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/engine/test/srfi64-extras.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/engine/test/test-extras.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/foo.go +lib/gnucash/scm/ccache/2.2/gnucash/gettext.go +lib/gnucash/scm/ccache/2.2/gnucash/gnc-module.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-load-deps.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-load-scm.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-dynload.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-init.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-module.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-multi.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-swigged-c.go +lib/gnucash/scm/ccache/2.2/gnucash/gnome-utils.go +lib/gnucash/scm/ccache/2.2/gnucash/import-export/qif-import.go +lib/gnucash/scm/ccache/2.2/gnucash/import-export/string.go +lib/gnucash/scm/ccache/2.2/gnucash/price-quotes.go +lib/gnucash/scm/ccache/2.2/gnucash/report/aging.go +lib/gnucash/scm/ccache/2.2/gnucash/report/balsheet-eg.go +lib/gnucash/scm/ccache/2.2/gnucash/report/business-reports.go +lib/gnucash/scm/ccache/2.2/gnucash/report/customer-summary.go +lib/gnucash/scm/ccache/2.2/gnucash/report/eguile-gnc.go +lib/gnucash/scm/ccache/2.2/gnucash/report/eguile-html-utilities.go +lib/gnucash/scm/ccache/2.2/gnucash/report/eguile-utilities.go +lib/gnucash/scm/ccache/2.2/gnucash/report/hello-world.go +lib/gnucash/scm/ccache/2.2/gnucash/report/invoice.go +lib/gnucash/scm/ccache/2.2/gnucash/report/job-report.go +lib/gnucash/scm/ccache/2.2/gnucash/report/locale-specific/de_DE.go +lib/gnucash/scm/ccache/2.2/gnucash/report/locale-specific/us.go +lib/gnucash/scm/ccache/2.2/gnucash/report/owner-report.go +lib/gnucash/scm/ccache/2.2/gnucash/report/payables.go +lib/gnucash/scm/ccache/2.2/gnucash/report/receipt.go +lib/gnucash/scm/ccache/2.2/gnucash/report/receivables.go +lib/gnucash/scm/ccache/2.2/gnucash/report/report-gnome.go +lib/gnucash/scm/ccache/2.2/gnucash/report/report-system.go +lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/collectors.go +lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/report-collectors.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-extras.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-load-report-system-module.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-test-extras.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/account-piecharts.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/account-summary.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/advanced-portfolio.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/average-balance.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/balance-forecast.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/balance-sheet.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-balance-sheet.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-barchart.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-flow.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-income-statement.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/cash-flow.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/cashflow-barchart.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/category-barchart.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/daily-reports.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/equity-statement.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/general-journal.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/general-ledger.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/income-gst-statement.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/income-statement.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/net-charts.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/portfolio.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/price-scatter.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/register.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/sx-summary.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-cash-flow.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/transaction.go +lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/trial-balance.go +lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-easy.go +lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-fancy.go +lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-footer.go +lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-head-or-tail.go +lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-plain.go +lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheets.go +lib/gnucash/scm/ccache/2.2/gnucash/report/taxinvoice.go +lib/gnucash/scm/ccache/2.2/gnucash/report/taxtxf-de_DE.go +lib/gnucash/scm/ccache/2.2/gnucash/report/taxtxf.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/report/test-load-report-stylesheets-module.go +lib/gnucash/scm/ccache/2.2/gnucash/report/utility-reports.go +lib/gnucash/scm/ccache/2.2/gnucash/report/view-column.go +lib/gnucash/scm/ccache/2.2/gnucash/report/welcome-to-gnucash.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/reports/test-load-app-utils-module.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/reports/test-load-gnome-utils-module.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/reports/test-load-report-gnome-module.go +lib/gnucash/scm/ccache/2.2/gnucash/tax/de_DE.go +lib/gnucash/scm/ccache/2.2/gnucash/tax/us.go +%%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/unittest-support.go +lib/gnucash/scm/ccache/2.2/gnucash/utilities.go +lib/gnucash/scm/ccache/2.2/hooks.go +lib/gnucash/scm/ccache/2.2/html-acct-table.go +lib/gnucash/scm/ccache/2.2/html-anytag.go +lib/gnucash/scm/ccache/2.2/html-barchart.go +lib/gnucash/scm/ccache/2.2/html-document.go +lib/gnucash/scm/ccache/2.2/html-fonts.go +lib/gnucash/scm/ccache/2.2/html-linechart.go +lib/gnucash/scm/ccache/2.2/html-piechart.go +lib/gnucash/scm/ccache/2.2/html-scatter.go +lib/gnucash/scm/ccache/2.2/html-style-info.go +lib/gnucash/scm/ccache/2.2/html-style-sheet.go +lib/gnucash/scm/ccache/2.2/html-table.go +lib/gnucash/scm/ccache/2.2/html-text.go +lib/gnucash/scm/ccache/2.2/html-utilities.go +lib/gnucash/scm/ccache/2.2/json.go +lib/gnucash/scm/ccache/2.2/json/builder.go +lib/gnucash/scm/ccache/2.2/json/parser.go +lib/gnucash/scm/ccache/2.2/json/syntax.go +lib/gnucash/scm/ccache/2.2/migrate-prefs.go +lib/gnucash/scm/ccache/2.2/options-utilities.go +lib/gnucash/scm/ccache/2.2/options.go +lib/gnucash/scm/ccache/2.2/prefs.go +lib/gnucash/scm/ccache/2.2/qif-import/qif-dialog-utils.go +lib/gnucash/scm/ccache/2.2/qif-import/qif-file.go +lib/gnucash/scm/ccache/2.2/qif-import/qif-guess-map.go +lib/gnucash/scm/ccache/2.2/qif-import/qif-import.go +lib/gnucash/scm/ccache/2.2/qif-import/qif-merge-groups.go +lib/gnucash/scm/ccache/2.2/qif-import/qif-objects.go +lib/gnucash/scm/ccache/2.2/qif-import/qif-parse.go +lib/gnucash/scm/ccache/2.2/qif-import/qif-to-gnc.go +lib/gnucash/scm/ccache/2.2/qif-import/qif-utils.go +lib/gnucash/scm/ccache/2.2/report-utilities.go +lib/gnucash/scm/ccache/2.2/report.go +lib/gnucash/scm/ccache/2.2/simple-obj.go +%%TEST%%lib/gnucash/scm/ccache/2.2/test-account.go +%%TEST%%lib/gnucash/scm/ccache/2.2/test-c-interface.go +%%TEST%%lib/gnucash/scm/ccache/2.2/test-create-account.go +%%TEST%%lib/gnucash/scm/ccache/2.2/test-split.go +lib/gnucash/scm/ccache/2.2/txf-de_DE.go +lib/gnucash/scm/ccache/2.2/txf-help-de_DE.go +lib/gnucash/scm/ccache/2.2/txf-help.go +lib/gnucash/scm/ccache/2.2/txf.go %%DATABASE%%lib/libgnc-backend-sql.so lib/libgnc-backend-xml-utils.so lib/libgnc-core-utils.so diff --git a/games/aisleriot/Makefile b/games/aisleriot/Makefile index 5537130fc8e6..ab42af2468f2 100644 --- a/games/aisleriot/Makefile +++ b/games/aisleriot/Makefile @@ -3,6 +3,7 @@ PORTNAME= aisleriot PORTVERSION= 3.22.5 +PORTREVISION= 1 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -12,7 +13,7 @@ COMMENT= Collection of patience games written in guile scheme BUILD_DEPENDS= itstool:textproc/itstool \ bash:shells/bash -LIB_DEPENDS= libguile-2.0.so:lang/guile2 \ +LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libgc-threaded.so:devel/boehm-gc-threaded @@ -25,8 +26,7 @@ USE_GNOME= cairo gconf2 gtk30 intlhack librsvg2 libxml2:build USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-card-theme-formats=svg \ - --with-guile=2.0 +CONFIGURE_ARGS= --with-card-theme-formats=svg # work around because configure needs bash CONFIGURE_SHELL=${LOCALBASE}/bin/bash diff --git a/games/aisleriot/pkg-plist b/games/aisleriot/pkg-plist index d887d567d1fa..c5db69c34d29 100644 --- a/games/aisleriot/pkg-plist +++ b/games/aisleriot/pkg-plist @@ -1,95 +1,95 @@ bin/sol -lib/aisleriot/guile/2.0/accordion.go -lib/aisleriot/guile/2.0/agnes.go -lib/aisleriot/guile/2.0/aisleriot/api.go -lib/aisleriot/guile/2.0/athena.go -lib/aisleriot/guile/2.0/auld-lang-syne.go -lib/aisleriot/guile/2.0/aunt-mary.go -lib/aisleriot/guile/2.0/backbone.go -lib/aisleriot/guile/2.0/bakers-dozen.go -lib/aisleriot/guile/2.0/bakers-game.go -lib/aisleriot/guile/2.0/bear-river.go -lib/aisleriot/guile/2.0/beleaguered-castle.go -lib/aisleriot/guile/2.0/block-ten.go -lib/aisleriot/guile/2.0/bristol.go -lib/aisleriot/guile/2.0/camelot.go -lib/aisleriot/guile/2.0/canfield.go -lib/aisleriot/guile/2.0/carpet.go -lib/aisleriot/guile/2.0/chessboard.go -lib/aisleriot/guile/2.0/clock.go -lib/aisleriot/guile/2.0/cover.go -lib/aisleriot/guile/2.0/cruel.go -lib/aisleriot/guile/2.0/diamond-mine.go -lib/aisleriot/guile/2.0/doublets.go -lib/aisleriot/guile/2.0/eagle-wing.go -lib/aisleriot/guile/2.0/easthaven.go -lib/aisleriot/guile/2.0/eight-off.go -lib/aisleriot/guile/2.0/elevator.go -lib/aisleriot/guile/2.0/eliminator.go -lib/aisleriot/guile/2.0/escalator.go -lib/aisleriot/guile/2.0/first-law.go -lib/aisleriot/guile/2.0/fortress.go -lib/aisleriot/guile/2.0/fortunes.go -lib/aisleriot/guile/2.0/forty-thieves.go -lib/aisleriot/guile/2.0/fourteen.go -lib/aisleriot/guile/2.0/freecell.go -lib/aisleriot/guile/2.0/gaps.go -lib/aisleriot/guile/2.0/gay-gordons.go -lib/aisleriot/guile/2.0/giant.go -lib/aisleriot/guile/2.0/glenwood.go -lib/aisleriot/guile/2.0/gold-mine.go -lib/aisleriot/guile/2.0/golf.go -lib/aisleriot/guile/2.0/gypsy.go -lib/aisleriot/guile/2.0/hamilton.go -lib/aisleriot/guile/2.0/helsinki.go -lib/aisleriot/guile/2.0/hopscotch.go -lib/aisleriot/guile/2.0/isabel.go -lib/aisleriot/guile/2.0/jamestown.go -lib/aisleriot/guile/2.0/jumbo.go -lib/aisleriot/guile/2.0/kansas.go -lib/aisleriot/guile/2.0/king-albert.go -lib/aisleriot/guile/2.0/kings-audience.go -lib/aisleriot/guile/2.0/klondike.go -lib/aisleriot/guile/2.0/labyrinth.go -lib/aisleriot/guile/2.0/lady-jane.go -lib/aisleriot/guile/2.0/maze.go -lib/aisleriot/guile/2.0/monte-carlo.go -lib/aisleriot/guile/2.0/napoleons-tomb.go -lib/aisleriot/guile/2.0/neighbor.go -lib/aisleriot/guile/2.0/odessa.go -lib/aisleriot/guile/2.0/osmosis.go -lib/aisleriot/guile/2.0/peek.go -lib/aisleriot/guile/2.0/pileon.go -lib/aisleriot/guile/2.0/plait.go -lib/aisleriot/guile/2.0/poker.go -lib/aisleriot/guile/2.0/quatorze.go -lib/aisleriot/guile/2.0/royal-east.go -lib/aisleriot/guile/2.0/saratoga.go -lib/aisleriot/guile/2.0/scorpion.go -lib/aisleriot/guile/2.0/scuffle.go -lib/aisleriot/guile/2.0/seahaven.go -lib/aisleriot/guile/2.0/sir-tommy.go -lib/aisleriot/guile/2.0/spider-three-decks.go -lib/aisleriot/guile/2.0/spider.go -lib/aisleriot/guile/2.0/spiderette.go -lib/aisleriot/guile/2.0/straight-up.go -lib/aisleriot/guile/2.0/streets-and-alleys.go -lib/aisleriot/guile/2.0/ten-across.go -lib/aisleriot/guile/2.0/terrace.go -lib/aisleriot/guile/2.0/thieves.go -lib/aisleriot/guile/2.0/thirteen.go -lib/aisleriot/guile/2.0/thumb-and-pouch.go -lib/aisleriot/guile/2.0/treize.go -lib/aisleriot/guile/2.0/triple-peaks.go -lib/aisleriot/guile/2.0/union-square.go -lib/aisleriot/guile/2.0/valentine.go -lib/aisleriot/guile/2.0/wall.go -lib/aisleriot/guile/2.0/westhaven.go -lib/aisleriot/guile/2.0/whitehead.go -lib/aisleriot/guile/2.0/will-o-the-wisp.go -lib/aisleriot/guile/2.0/yield.go -lib/aisleriot/guile/2.0/yukon.go -lib/aisleriot/guile/2.0/zebra.go +lib/aisleriot/guile/2.2/accordion.go +lib/aisleriot/guile/2.2/agnes.go +lib/aisleriot/guile/2.2/aisleriot/api.go +lib/aisleriot/guile/2.2/athena.go +lib/aisleriot/guile/2.2/auld-lang-syne.go +lib/aisleriot/guile/2.2/aunt-mary.go +lib/aisleriot/guile/2.2/backbone.go +lib/aisleriot/guile/2.2/bakers-dozen.go +lib/aisleriot/guile/2.2/bakers-game.go +lib/aisleriot/guile/2.2/bear-river.go +lib/aisleriot/guile/2.2/beleaguered-castle.go +lib/aisleriot/guile/2.2/block-ten.go +lib/aisleriot/guile/2.2/bristol.go +lib/aisleriot/guile/2.2/camelot.go +lib/aisleriot/guile/2.2/canfield.go +lib/aisleriot/guile/2.2/carpet.go +lib/aisleriot/guile/2.2/chessboard.go +lib/aisleriot/guile/2.2/clock.go +lib/aisleriot/guile/2.2/cover.go +lib/aisleriot/guile/2.2/cruel.go +lib/aisleriot/guile/2.2/diamond-mine.go +lib/aisleriot/guile/2.2/doublets.go +lib/aisleriot/guile/2.2/eagle-wing.go +lib/aisleriot/guile/2.2/easthaven.go +lib/aisleriot/guile/2.2/eight-off.go +lib/aisleriot/guile/2.2/elevator.go +lib/aisleriot/guile/2.2/eliminator.go +lib/aisleriot/guile/2.2/escalator.go +lib/aisleriot/guile/2.2/first-law.go +lib/aisleriot/guile/2.2/fortress.go +lib/aisleriot/guile/2.2/fortunes.go +lib/aisleriot/guile/2.2/forty-thieves.go +lib/aisleriot/guile/2.2/fourteen.go +lib/aisleriot/guile/2.2/freecell.go +lib/aisleriot/guile/2.2/gaps.go +lib/aisleriot/guile/2.2/gay-gordons.go +lib/aisleriot/guile/2.2/giant.go +lib/aisleriot/guile/2.2/glenwood.go +lib/aisleriot/guile/2.2/gold-mine.go +lib/aisleriot/guile/2.2/golf.go +lib/aisleriot/guile/2.2/gypsy.go +lib/aisleriot/guile/2.2/hamilton.go +lib/aisleriot/guile/2.2/helsinki.go +lib/aisleriot/guile/2.2/hopscotch.go +lib/aisleriot/guile/2.2/isabel.go +lib/aisleriot/guile/2.2/jamestown.go +lib/aisleriot/guile/2.2/jumbo.go +lib/aisleriot/guile/2.2/kansas.go +lib/aisleriot/guile/2.2/king-albert.go +lib/aisleriot/guile/2.2/kings-audience.go +lib/aisleriot/guile/2.2/klondike.go +lib/aisleriot/guile/2.2/labyrinth.go +lib/aisleriot/guile/2.2/lady-jane.go +lib/aisleriot/guile/2.2/maze.go +lib/aisleriot/guile/2.2/monte-carlo.go +lib/aisleriot/guile/2.2/napoleons-tomb.go +lib/aisleriot/guile/2.2/neighbor.go +lib/aisleriot/guile/2.2/odessa.go +lib/aisleriot/guile/2.2/osmosis.go +lib/aisleriot/guile/2.2/peek.go +lib/aisleriot/guile/2.2/pileon.go +lib/aisleriot/guile/2.2/plait.go +lib/aisleriot/guile/2.2/poker.go +lib/aisleriot/guile/2.2/quatorze.go +lib/aisleriot/guile/2.2/royal-east.go +lib/aisleriot/guile/2.2/saratoga.go +lib/aisleriot/guile/2.2/scorpion.go +lib/aisleriot/guile/2.2/scuffle.go +lib/aisleriot/guile/2.2/seahaven.go +lib/aisleriot/guile/2.2/sir-tommy.go +lib/aisleriot/guile/2.2/spider-three-decks.go +lib/aisleriot/guile/2.2/spider.go +lib/aisleriot/guile/2.2/spiderette.go +lib/aisleriot/guile/2.2/straight-up.go +lib/aisleriot/guile/2.2/streets-and-alleys.go +lib/aisleriot/guile/2.2/ten-across.go +lib/aisleriot/guile/2.2/terrace.go +lib/aisleriot/guile/2.2/thieves.go +lib/aisleriot/guile/2.2/thirteen.go +lib/aisleriot/guile/2.2/thumb-and-pouch.go +lib/aisleriot/guile/2.2/treize.go +lib/aisleriot/guile/2.2/triple-peaks.go +lib/aisleriot/guile/2.2/union-square.go +lib/aisleriot/guile/2.2/valentine.go +lib/aisleriot/guile/2.2/wall.go +lib/aisleriot/guile/2.2/westhaven.go +lib/aisleriot/guile/2.2/whitehead.go +lib/aisleriot/guile/2.2/will-o-the-wisp.go +lib/aisleriot/guile/2.2/yield.go +lib/aisleriot/guile/2.2/yukon.go +lib/aisleriot/guile/2.2/zebra.go lib/valgrind/aisleriot.supp libexec/aisleriot/ar-cards-renderer man/man6/sol.6.gz diff --git a/games/gnubik/Makefile b/games/gnubik/Makefile index d66ab657552d..e41570dddb4f 100644 --- a/games/gnubik/Makefile +++ b/games/gnubik/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnubik PORTVERSION= 2.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= GNU @@ -13,7 +13,7 @@ COMMENT= 3D Rubik's cube game LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libguile-2.0.so:lang/guile2 \ +LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ libgtkglext-x11-1.0.so:x11-toolkits/gtkglext GNU_CONFIGURE= yes @@ -27,6 +27,10 @@ INFO= gnubik OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \ + ${WRKSRC}/configure + post-install: ${LN} -s ../icons/hicolor/32x32/apps/gnubik.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile index de906f9e3a36..3f8560b39a33 100644 --- a/games/trackballs/Makefile +++ b/games/trackballs/Makefile @@ -4,7 +4,7 @@ PORTNAME= trackballs PORTVERSION= 1.3.1 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MAINTAINER= martymac@FreeBSD.org @@ -13,7 +13,7 @@ COMMENT= SDL-based Marble Madness clone LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libguile-2.0.so:lang/guile2 \ +LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ libgc.so:devel/boehm-gc USES= cmake desktop-file-utils gettext-runtime gl gnome pkgconfig sdl diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 309844048475..a1896c8ddf1d 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -3,7 +3,7 @@ PORTNAME= graphviz PORTVERSION= 2.40.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics tk MASTER_SITES= https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/ @@ -106,7 +106,7 @@ SMYRNA_LIB_DEPENDS= libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \ libgtkglext-x11-1.0.so:x11-toolkits/gtkglext MING_LIB_DEPENDS= libming.so:graphics/ming DEVIL_LIB_DEPENDS= libIL.so:graphics/devil -GUILE_LIB_DEPENDS= libguile-2.0.so:lang/guile2 \ +GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ libgc-threaded.so:devel/boehm-gc-threaded XPM_CONFIGURE_WITH= x diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile index 2cc708b3a17b..4ba301438d6b 100644 --- a/irc/weechat/Makefile +++ b/irc/weechat/Makefile @@ -3,6 +3,7 @@ PORTNAME= weechat PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= https://weechat.org/files/src/ @@ -19,8 +20,7 @@ LIB_DEPENDS+= libcurl.so:ftp/curl \ USES= cmake:noninja ncurses libtool tar:xz USE_LDCONFIG= yes -CMAKE_ARGS+= -DENABLE_GUILE=no \ - -DLIBDATADIR=${LOCALBASE}/libdata +CMAKE_ARGS= -DLIBDATADIR=${LOCALBASE}/libdata OPTIONS_DEFINE= BACKTRACE DOCS CA_BUNDLE GNUTLS HEADLESS ICON ICONV \ MANPAGES NLS @@ -58,7 +58,8 @@ DOCS_CMAKE_BOOL= ENABLE_DOC DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_USES= pkgconfig -GUILE_LIB_DEPENDS= libguile-2.0.so:lang/guile2 +GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 +GUILE_CMAKE_BOOL= ENABLE_GUILE ICONV_USES= iconv JAVASCRIPT_LIB_DEPENDS= libv8.so:lang/v8 LUA_USES= lua pkgconfig diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile index 2b10737fd715..d0980639e2b5 100644 --- a/lang/guile2/Makefile +++ b/lang/guile2/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= guile -PORTVERSION= 2.0.14 -PORTREVISION= 10 +PORTVERSION= 2.2.5 CATEGORIES= lang scheme MASTER_SITES= GNU PKGNAMESUFFIX= 2 @@ -24,7 +23,7 @@ CONFLICTS_INSTALL= guile-[0-9]* MAKE_JOBS_UNSAFE= yes USES= charsetfix ${USES_${ARCH}} gmake iconv libtool makeinfo ncurses pathfix \ - pkgconfig readline + pkgconfig readline tar:lz USES_powerpc64= compiler:c11 USE_LDCONFIG= yes @@ -57,6 +56,8 @@ post-patch: ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES} @${REINPLACE_CMD} -e 's|sys/time.h sys/timeb.h|sys/time.h |g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-i -e|-i.bak -e|' \ + ${WRKSRC}/libguile/Makefile.in post-patch-THREADS-on: @${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure diff --git a/lang/guile2/distinfo b/lang/guile2/distinfo index b2490986ea9b..ac068d0a351f 100644 --- a/lang/guile2/distinfo +++ b/lang/guile2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487980204 -SHA256 (guile-2.0.14.tar.gz) = 8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1 -SIZE (guile-2.0.14.tar.gz) = 7823099 +TIMESTAMP = 1561026500 +SHA256 (guile-2.2.5.tar.lz) = 340a2ec7a6beb080f1b6f34e642dc2fb2235176468dcad2d01fdc695ed5a0128 +SIZE (guile-2.2.5.tar.lz) = 9220300 diff --git a/lang/guile2/files/patch-libguile_____scm.h b/lang/guile2/files/patch-libguile_____scm.h deleted file mode 100644 index 1c5f854843e5..000000000000 --- a/lang/guile2/files/patch-libguile_____scm.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libguile/__scm.h.orig 2014-01-21 21:25:11 UTC -+++ libguile/__scm.h -@@ -544,7 +544,8 @@ typedef void *scm_t_subr; - * that all the state of the process is contained in the stack. - */ - --#if defined (sparc) || defined (__sparc__) || defined (__sparc) -+#if (defined (sparc) || defined (__sparc__) || defined (__sparc)) && \ -+ defined(__FreeBSD__) - # define SCM_FLUSH_REGISTER_WINDOWS asm("ta 3") - #else - # define SCM_FLUSH_REGISTER_WINDOWS /* empty */ diff --git a/lang/guile2/pkg-plist b/lang/guile2/pkg-plist index 5fe91f11e77c..7d1d9014ea98 100644 --- a/lang/guile2/pkg-plist +++ b/lang/guile2/pkg-plist @@ -6,11 +6,11 @@ bin/guile-tools include/guile/%%GUILE_VER%%/libguile.h include/guile/%%GUILE_VER%%/libguile/__scm.h include/guile/%%GUILE_VER%%/libguile/alist.h -include/guile/%%GUILE_VER%%/libguile/arbiters.h include/guile/%%GUILE_VER%%/libguile/array-handle.h include/guile/%%GUILE_VER%%/libguile/array-map.h include/guile/%%GUILE_VER%%/libguile/arrays.h include/guile/%%GUILE_VER%%/libguile/async.h +include/guile/%%GUILE_VER%%/libguile/atomic.h include/guile/%%GUILE_VER%%/libguile/backtrace.h include/guile/%%GUILE_VER%%/libguile/bdw-gc.h include/guile/%%GUILE_VER%%/libguile/bitvectors.h @@ -24,6 +24,7 @@ include/guile/%%GUILE_VER%%/libguile/debug.h include/guile/%%GUILE_VER%%/libguile/deprecated.h include/guile/%%GUILE_VER%%/libguile/deprecation.h include/guile/%%GUILE_VER%%/libguile/dynl.h +include/guile/%%GUILE_VER%%/libguile/dynstack.h include/guile/%%GUILE_VER%%/libguile/dynwind.h include/guile/%%GUILE_VER%%/libguile/eq.h include/guile/%%GUILE_VER%%/libguile/error.h @@ -31,16 +32,17 @@ include/guile/%%GUILE_VER%%/libguile/eval.h include/guile/%%GUILE_VER%%/libguile/evalext.h include/guile/%%GUILE_VER%%/libguile/expand.h include/guile/%%GUILE_VER%%/libguile/extensions.h +include/guile/%%GUILE_VER%%/libguile/fdes-finalizers.h include/guile/%%GUILE_VER%%/libguile/feature.h include/guile/%%GUILE_VER%%/libguile/filesys.h include/guile/%%GUILE_VER%%/libguile/finalizers.h include/guile/%%GUILE_VER%%/libguile/fluids.h +include/guile/%%GUILE_VER%%/libguile/foreign-object.h include/guile/%%GUILE_VER%%/libguile/foreign.h include/guile/%%GUILE_VER%%/libguile/fports.h include/guile/%%GUILE_VER%%/libguile/frames.h +include/guile/%%GUILE_VER%%/libguile/gc-inline.h include/guile/%%GUILE_VER%%/libguile/gc.h -include/guile/%%GUILE_VER%%/libguile/gdb_interface.h -include/guile/%%GUILE_VER%%/libguile/gdbint.h include/guile/%%GUILE_VER%%/libguile/generalized-arrays.h include/guile/%%GUILE_VER%%/libguile/generalized-vectors.h include/guile/%%GUILE_VER%%/libguile/gettext.h @@ -59,6 +61,7 @@ include/guile/%%GUILE_VER%%/libguile/iselect.h include/guile/%%GUILE_VER%%/libguile/keywords.h include/guile/%%GUILE_VER%%/libguile/list.h include/guile/%%GUILE_VER%%/libguile/load.h +include/guile/%%GUILE_VER%%/libguile/loader.h include/guile/%%GUILE_VER%%/libguile/macros.h include/guile/%%GUILE_VER%%/libguile/mallocs.h include/guile/%%GUILE_VER%%/libguile/memoize.h @@ -66,7 +69,6 @@ include/guile/%%GUILE_VER%%/libguile/modules.h include/guile/%%GUILE_VER%%/libguile/net_db.h include/guile/%%GUILE_VER%%/libguile/null-threads.h include/guile/%%GUILE_VER%%/libguile/numbers.h -include/guile/%%GUILE_VER%%/libguile/objcodes.h include/guile/%%GUILE_VER%%/libguile/objprop.h include/guile/%%GUILE_VER%%/libguile/options.h include/guile/%%GUILE_VER%%/libguile/pairs.h @@ -84,7 +86,6 @@ include/guile/%%GUILE_VER%%/libguile/random.h include/guile/%%GUILE_VER%%/libguile/rdelim.h include/guile/%%GUILE_VER%%/libguile/read.h include/guile/%%GUILE_VER%%/libguile/regex-posix.h -include/guile/%%GUILE_VER%%/libguile/root.h include/guile/%%GUILE_VER%%/libguile/rw.h include/guile/%%GUILE_VER%%/libguile/scmconfig.h include/guile/%%GUILE_VER%%/libguile/scmsigs.h @@ -119,13 +120,17 @@ include/guile/%%GUILE_VER%%/libguile/values.h include/guile/%%GUILE_VER%%/libguile/variable.h include/guile/%%GUILE_VER%%/libguile/vectors.h include/guile/%%GUILE_VER%%/libguile/version.h -include/guile/%%GUILE_VER%%/libguile/vm-engine.h +include/guile/%%GUILE_VER%%/libguile/vm-builtins.h include/guile/%%GUILE_VER%%/libguile/vm-expand.h include/guile/%%GUILE_VER%%/libguile/vm.h include/guile/%%GUILE_VER%%/libguile/vports.h -include/guile/%%GUILE_VER%%/libguile/weaks.h +include/guile/%%GUILE_VER%%/libguile/weak-set.h +include/guile/%%GUILE_VER%%/libguile/weak-table.h +include/guile/%%GUILE_VER%%/libguile/weak-vector.h include/guile/%%GUILE_VER%%/readline.h lib/guile/%%GUILE_VER%%/ccache/ice-9/and-let-star.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/arrays.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/atomic.go lib/guile/%%GUILE_VER%%/ccache/ice-9/binary-ports.go lib/guile/%%GUILE_VER%%/ccache/ice-9/boot-9.go lib/guile/%%GUILE_VER%%/ccache/ice-9/buffered-input.go @@ -141,6 +146,7 @@ lib/guile/%%GUILE_VER%%/ccache/ice-9/documentation.go lib/guile/%%GUILE_VER%%/ccache/ice-9/eval-string.go lib/guile/%%GUILE_VER%%/ccache/ice-9/eval.go lib/guile/%%GUILE_VER%%/ccache/ice-9/expect.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/fdes-finalizers.go lib/guile/%%GUILE_VER%%/ccache/ice-9/format.go lib/guile/%%GUILE_VER%%/ccache/ice-9/ftw.go lib/guile/%%GUILE_VER%%/ccache/ice-9/futures.go @@ -161,14 +167,20 @@ lib/guile/%%GUILE_VER%%/ccache/ice-9/networking.go lib/guile/%%GUILE_VER%%/ccache/ice-9/null.go lib/guile/%%GUILE_VER%%/ccache/ice-9/occam-channel.go lib/guile/%%GUILE_VER%%/ccache/ice-9/optargs.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/peg.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/peg/cache.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/peg/codegen.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/peg/simplify-tree.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/peg/string-peg.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/peg/using-parsers.go lib/guile/%%GUILE_VER%%/ccache/ice-9/poe.go lib/guile/%%GUILE_VER%%/ccache/ice-9/poll.go lib/guile/%%GUILE_VER%%/ccache/ice-9/popen.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/ports.go lib/guile/%%GUILE_VER%%/ccache/ice-9/posix.go lib/guile/%%GUILE_VER%%/ccache/ice-9/pretty-print.go lib/guile/%%GUILE_VER%%/ccache/ice-9/psyntax-pp.go lib/guile/%%GUILE_VER%%/ccache/ice-9/q.go -lib/guile/%%GUILE_VER%%/ccache/ice-9/r4rs.go lib/guile/%%GUILE_VER%%/ccache/ice-9/r5rs.go lib/guile/%%GUILE_VER%%/ccache/ice-9/rdelim.go lib/guile/%%GUILE_VER%%/ccache/ice-9/readline.go @@ -178,6 +190,7 @@ lib/guile/%%GUILE_VER%%/ccache/ice-9/runq.go lib/guile/%%GUILE_VER%%/ccache/ice-9/rw.go lib/guile/%%GUILE_VER%%/ccache/ice-9/safe-r5rs.go lib/guile/%%GUILE_VER%%/ccache/ice-9/safe.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/sandbox.go lib/guile/%%GUILE_VER%%/ccache/ice-9/save-stack.go lib/guile/%%GUILE_VER%%/ccache/ice-9/scm-style-repl.go lib/guile/%%GUILE_VER%%/ccache/ice-9/serialize.go @@ -186,23 +199,55 @@ lib/guile/%%GUILE_VER%%/ccache/ice-9/slib.go lib/guile/%%GUILE_VER%%/ccache/ice-9/stack-catch.go lib/guile/%%GUILE_VER%%/ccache/ice-9/streams.go lib/guile/%%GUILE_VER%%/ccache/ice-9/string-fun.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/suspendable-ports.go lib/guile/%%GUILE_VER%%/ccache/ice-9/syncase.go +lib/guile/%%GUILE_VER%%/ccache/ice-9/textual-ports.go lib/guile/%%GUILE_VER%%/ccache/ice-9/threads.go lib/guile/%%GUILE_VER%%/ccache/ice-9/time.go lib/guile/%%GUILE_VER%%/ccache/ice-9/top-repl.go lib/guile/%%GUILE_VER%%/ccache/ice-9/unicode.go lib/guile/%%GUILE_VER%%/ccache/ice-9/vlist.go lib/guile/%%GUILE_VER%%/ccache/ice-9/weak-vector.go -lib/guile/%%GUILE_VER%%/ccache/language/assembly.go -lib/guile/%%GUILE_VER%%/ccache/language/assembly/compile-bytecode.go -lib/guile/%%GUILE_VER%%/ccache/language/assembly/decompile-bytecode.go -lib/guile/%%GUILE_VER%%/ccache/language/assembly/disassemble.go -lib/guile/%%GUILE_VER%%/ccache/language/assembly/spec.go lib/guile/%%GUILE_VER%%/ccache/language/brainfuck/compile-scheme.go lib/guile/%%GUILE_VER%%/ccache/language/brainfuck/compile-tree-il.go lib/guile/%%GUILE_VER%%/ccache/language/brainfuck/parse.go lib/guile/%%GUILE_VER%%/ccache/language/brainfuck/spec.go +lib/guile/%%GUILE_VER%%/ccache/language/bytecode.go lib/guile/%%GUILE_VER%%/ccache/language/bytecode/spec.go +lib/guile/%%GUILE_VER%%/ccache/language/cps.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/closure-conversion.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/compile-bytecode.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/constructors.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/contification.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/cse.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/dce.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/effects-analysis.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/elide-values.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/handle-interrupts.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/intmap.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/intset.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/licm.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/optimize.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/peel-loops.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/primitives.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/prune-bailouts.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/prune-top-level-scopes.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/reify-primitives.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/renumber.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/rotate-loops.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/self-references.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/simplify.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/slot-allocation.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/spec.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/specialize-numbers.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/specialize-primcalls.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/split-rec.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/type-checks.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/type-fold.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/types.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/utils.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/verify.go +lib/guile/%%GUILE_VER%%/ccache/language/cps/with-cps.go lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/array.go lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/base.go lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/compile-tree-il.go @@ -212,31 +257,25 @@ lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/parse.go lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/spec.go lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/tokenize.go lib/guile/%%GUILE_VER%%/ccache/language/elisp/bindings.go +lib/guile/%%GUILE_VER%%/ccache/language/elisp/boot.go lib/guile/%%GUILE_VER%%/ccache/language/elisp/compile-tree-il.go +lib/guile/%%GUILE_VER%%/ccache/language/elisp/falias.go lib/guile/%%GUILE_VER%%/ccache/language/elisp/lexer.go lib/guile/%%GUILE_VER%%/ccache/language/elisp/parser.go lib/guile/%%GUILE_VER%%/ccache/language/elisp/runtime.go lib/guile/%%GUILE_VER%%/ccache/language/elisp/runtime/function-slot.go -lib/guile/%%GUILE_VER%%/ccache/language/elisp/runtime/macros.go -lib/guile/%%GUILE_VER%%/ccache/language/elisp/runtime/subrs.go lib/guile/%%GUILE_VER%%/ccache/language/elisp/runtime/value-slot.go lib/guile/%%GUILE_VER%%/ccache/language/elisp/spec.go -lib/guile/%%GUILE_VER%%/ccache/language/glil.go -lib/guile/%%GUILE_VER%%/ccache/language/glil/compile-assembly.go -lib/guile/%%GUILE_VER%%/ccache/language/glil/spec.go -lib/guile/%%GUILE_VER%%/ccache/language/objcode/spec.go lib/guile/%%GUILE_VER%%/ccache/language/scheme/compile-tree-il.go lib/guile/%%GUILE_VER%%/ccache/language/scheme/decompile-tree-il.go lib/guile/%%GUILE_VER%%/ccache/language/scheme/spec.go lib/guile/%%GUILE_VER%%/ccache/language/tree-il.go lib/guile/%%GUILE_VER%%/ccache/language/tree-il/analyze.go lib/guile/%%GUILE_VER%%/ccache/language/tree-il/canonicalize.go -lib/guile/%%GUILE_VER%%/ccache/language/tree-il/compile-glil.go -lib/guile/%%GUILE_VER%%/ccache/language/tree-il/cse.go +lib/guile/%%GUILE_VER%%/ccache/language/tree-il/compile-cps.go lib/guile/%%GUILE_VER%%/ccache/language/tree-il/debug.go lib/guile/%%GUILE_VER%%/ccache/language/tree-il/effects.go lib/guile/%%GUILE_VER%%/ccache/language/tree-il/fix-letrec.go -lib/guile/%%GUILE_VER%%/ccache/language/tree-il/inline.go lib/guile/%%GUILE_VER%%/ccache/language/tree-il/optimize.go lib/guile/%%GUILE_VER%%/ccache/language/tree-il/peval.go lib/guile/%%GUILE_VER%%/ccache/language/tree-il/primitives.go @@ -245,15 +284,12 @@ lib/guile/%%GUILE_VER%%/ccache/language/value/spec.go lib/guile/%%GUILE_VER%%/ccache/oop/goops.go lib/guile/%%GUILE_VER%%/ccache/oop/goops/accessors.go lib/guile/%%GUILE_VER%%/ccache/oop/goops/active-slot.go -lib/guile/%%GUILE_VER%%/ccache/oop/goops/compile.go lib/guile/%%GUILE_VER%%/ccache/oop/goops/composite-slot.go lib/guile/%%GUILE_VER%%/ccache/oop/goops/describe.go -lib/guile/%%GUILE_VER%%/ccache/oop/goops/dispatch.go lib/guile/%%GUILE_VER%%/ccache/oop/goops/internal.go lib/guile/%%GUILE_VER%%/ccache/oop/goops/save.go lib/guile/%%GUILE_VER%%/ccache/oop/goops/simple.go lib/guile/%%GUILE_VER%%/ccache/oop/goops/stklos.go -lib/guile/%%GUILE_VER%%/ccache/oop/goops/util.go lib/guile/%%GUILE_VER%%/ccache/rnrs.go lib/guile/%%GUILE_VER%%/ccache/rnrs/arithmetic/bitwise.go lib/guile/%%GUILE_VER%%/ccache/rnrs/arithmetic/fixnums.go @@ -331,6 +367,7 @@ lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-60.go lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-64.go lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-67.go lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-69.go +lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-71.go lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-8.go lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-88.go lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-9.go @@ -354,6 +391,7 @@ lib/guile/%%GUILE_VER%%/ccache/system/base/pmatch.go lib/guile/%%GUILE_VER%%/ccache/system/base/syntax.go lib/guile/%%GUILE_VER%%/ccache/system/base/target.go lib/guile/%%GUILE_VER%%/ccache/system/base/types.go +lib/guile/%%GUILE_VER%%/ccache/system/foreign-object.go lib/guile/%%GUILE_VER%%/ccache/system/foreign.go lib/guile/%%GUILE_VER%%/ccache/system/repl/command.go lib/guile/%%GUILE_VER%%/ccache/system/repl/common.go @@ -362,11 +400,17 @@ lib/guile/%%GUILE_VER%%/ccache/system/repl/debug.go lib/guile/%%GUILE_VER%%/ccache/system/repl/error-handling.go lib/guile/%%GUILE_VER%%/ccache/system/repl/repl.go lib/guile/%%GUILE_VER%%/ccache/system/repl/server.go +lib/guile/%%GUILE_VER%%/ccache/system/syntax.go +lib/guile/%%GUILE_VER%%/ccache/system/vm/assembler.go lib/guile/%%GUILE_VER%%/ccache/system/vm/coverage.go +lib/guile/%%GUILE_VER%%/ccache/system/vm/debug.go +lib/guile/%%GUILE_VER%%/ccache/system/vm/disassembler.go +lib/guile/%%GUILE_VER%%/ccache/system/vm/dwarf.go +lib/guile/%%GUILE_VER%%/ccache/system/vm/elf.go lib/guile/%%GUILE_VER%%/ccache/system/vm/frame.go lib/guile/%%GUILE_VER%%/ccache/system/vm/inspect.go -lib/guile/%%GUILE_VER%%/ccache/system/vm/instruction.go -lib/guile/%%GUILE_VER%%/ccache/system/vm/objcode.go +lib/guile/%%GUILE_VER%%/ccache/system/vm/linker.go +lib/guile/%%GUILE_VER%%/ccache/system/vm/loader.go lib/guile/%%GUILE_VER%%/ccache/system/vm/program.go lib/guile/%%GUILE_VER%%/ccache/system/vm/trace.go lib/guile/%%GUILE_VER%%/ccache/system/vm/trap-state.go @@ -388,20 +432,22 @@ lib/guile/%%GUILE_VER%%/ccache/web/response.go lib/guile/%%GUILE_VER%%/ccache/web/server.go lib/guile/%%GUILE_VER%%/ccache/web/server/http.go lib/guile/%%GUILE_VER%%/ccache/web/uri.go +lib/guile/%%GUILE_VER%%/extensions/guile-readline.a +lib/guile/%%GUILE_VER%%/extensions/guile-readline.so +lib/guile/%%GUILE_VER%%/extensions/guile-readline.so.0 +lib/guile/%%GUILE_VER%%/extensions/guile-readline.so.0.0.0 lib/libguile-%%GUILE_VER%%.a lib/libguile-%%GUILE_VER%%.so -lib/libguile-%%GUILE_VER%%.so.22 -lib/libguile-%%GUILE_VER%%.so.22.8.1 -lib/libguile-%%GUILE_VER%%.so.22.8.1-gdb.scm -lib/libguilereadline-v-18.a -lib/libguilereadline-v-18.so -lib/libguilereadline-v-18.so.18 -lib/libguilereadline-v-18.so.18.0.0 +lib/libguile-%%GUILE_VER%%.so.1 +lib/libguile-%%GUILE_VER%%.so.1.4.0 +lib/libguile-%%GUILE_VER%%.so.1.4.0-gdb.scm libdata/pkgconfig/guile-%%GUILE_VER%%.pc man/man1/guile.1.gz share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt %%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/arrays.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/atomic.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/binary-ports.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/boot-9.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/buffered-input.scm @@ -417,6 +463,7 @@ share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/ice-9/eval-string.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/eval.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/expect.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/fdes-finalizers.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/format.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/ftw.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/futures.scm @@ -438,16 +485,22 @@ share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/ice-9/null.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/occam-channel.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/optargs.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/peg.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/peg/cache.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/peg/codegen.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/peg/simplify-tree.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/peg/string-peg.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/peg/using-parsers.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/poe.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/poll.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/popen.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/ports.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/posix.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/pretty-print.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/psyntax-pp.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/psyntax.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/q.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/quasisyntax.scm -%%DATADIR%%/%%GUILE_VER%%/ice-9/r4rs.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/r5rs.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/r6rs-libraries.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/rdelim.scm @@ -458,6 +511,7 @@ share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/ice-9/rw.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/safe-r5rs.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/safe.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/sandbox.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/save-stack.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/scm-style-repl.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/serialize.scm @@ -466,23 +520,55 @@ share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/ice-9/stack-catch.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/streams.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/string-fun.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/suspendable-ports.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/syncase.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/textual-ports.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/threads.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/time.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/top-repl.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/unicode.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/vlist.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/weak-vector.scm -%%DATADIR%%/%%GUILE_VER%%/language/assembly.scm -%%DATADIR%%/%%GUILE_VER%%/language/assembly/compile-bytecode.scm -%%DATADIR%%/%%GUILE_VER%%/language/assembly/decompile-bytecode.scm -%%DATADIR%%/%%GUILE_VER%%/language/assembly/disassemble.scm -%%DATADIR%%/%%GUILE_VER%%/language/assembly/spec.scm %%DATADIR%%/%%GUILE_VER%%/language/brainfuck/compile-scheme.scm %%DATADIR%%/%%GUILE_VER%%/language/brainfuck/compile-tree-il.scm %%DATADIR%%/%%GUILE_VER%%/language/brainfuck/parse.scm %%DATADIR%%/%%GUILE_VER%%/language/brainfuck/spec.scm +%%DATADIR%%/%%GUILE_VER%%/language/bytecode.scm %%DATADIR%%/%%GUILE_VER%%/language/bytecode/spec.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/closure-conversion.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/compile-bytecode.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/constructors.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/contification.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/cse.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/dce.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/effects-analysis.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/elide-values.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/handle-interrupts.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/intmap.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/intset.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/licm.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/optimize.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/peel-loops.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/primitives.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/prune-bailouts.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/prune-top-level-scopes.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/reify-primitives.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/renumber.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/rotate-loops.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/self-references.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/simplify.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/slot-allocation.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/spec.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/specialize-numbers.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/specialize-primcalls.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/split-rec.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/type-checks.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/type-fold.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/types.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/utils.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/verify.scm +%%DATADIR%%/%%GUILE_VER%%/language/cps/with-cps.scm %%DATADIR%%/%%GUILE_VER%%/language/ecmascript/array.scm %%DATADIR%%/%%GUILE_VER%%/language/ecmascript/base.scm %%DATADIR%%/%%GUILE_VER%%/language/ecmascript/compile-tree-il.scm @@ -492,31 +578,25 @@ share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/language/ecmascript/spec.scm %%DATADIR%%/%%GUILE_VER%%/language/ecmascript/tokenize.scm %%DATADIR%%/%%GUILE_VER%%/language/elisp/bindings.scm +%%DATADIR%%/%%GUILE_VER%%/language/elisp/boot.el %%DATADIR%%/%%GUILE_VER%%/language/elisp/compile-tree-il.scm +%%DATADIR%%/%%GUILE_VER%%/language/elisp/falias.scm %%DATADIR%%/%%GUILE_VER%%/language/elisp/lexer.scm %%DATADIR%%/%%GUILE_VER%%/language/elisp/parser.scm %%DATADIR%%/%%GUILE_VER%%/language/elisp/runtime.scm %%DATADIR%%/%%GUILE_VER%%/language/elisp/runtime/function-slot.scm -%%DATADIR%%/%%GUILE_VER%%/language/elisp/runtime/macros.scm -%%DATADIR%%/%%GUILE_VER%%/language/elisp/runtime/subrs.scm %%DATADIR%%/%%GUILE_VER%%/language/elisp/runtime/value-slot.scm %%DATADIR%%/%%GUILE_VER%%/language/elisp/spec.scm -%%DATADIR%%/%%GUILE_VER%%/language/glil.scm -%%DATADIR%%/%%GUILE_VER%%/language/glil/compile-assembly.scm -%%DATADIR%%/%%GUILE_VER%%/language/glil/spec.scm -%%DATADIR%%/%%GUILE_VER%%/language/objcode/spec.scm %%DATADIR%%/%%GUILE_VER%%/language/scheme/compile-tree-il.scm %%DATADIR%%/%%GUILE_VER%%/language/scheme/decompile-tree-il.scm %%DATADIR%%/%%GUILE_VER%%/language/scheme/spec.scm %%DATADIR%%/%%GUILE_VER%%/language/tree-il.scm %%DATADIR%%/%%GUILE_VER%%/language/tree-il/analyze.scm %%DATADIR%%/%%GUILE_VER%%/language/tree-il/canonicalize.scm -%%DATADIR%%/%%GUILE_VER%%/language/tree-il/compile-glil.scm -%%DATADIR%%/%%GUILE_VER%%/language/tree-il/cse.scm +%%DATADIR%%/%%GUILE_VER%%/language/tree-il/compile-cps.scm %%DATADIR%%/%%GUILE_VER%%/language/tree-il/debug.scm %%DATADIR%%/%%GUILE_VER%%/language/tree-il/effects.scm %%DATADIR%%/%%GUILE_VER%%/language/tree-il/fix-letrec.scm -%%DATADIR%%/%%GUILE_VER%%/language/tree-il/inline.scm %%DATADIR%%/%%GUILE_VER%%/language/tree-il/optimize.scm %%DATADIR%%/%%GUILE_VER%%/language/tree-il/peval.scm %%DATADIR%%/%%GUILE_VER%%/language/tree-il/primitives.scm @@ -525,15 +605,12 @@ share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/oop/goops.scm %%DATADIR%%/%%GUILE_VER%%/oop/goops/accessors.scm %%DATADIR%%/%%GUILE_VER%%/oop/goops/active-slot.scm -%%DATADIR%%/%%GUILE_VER%%/oop/goops/compile.scm %%DATADIR%%/%%GUILE_VER%%/oop/goops/composite-slot.scm %%DATADIR%%/%%GUILE_VER%%/oop/goops/describe.scm -%%DATADIR%%/%%GUILE_VER%%/oop/goops/dispatch.scm %%DATADIR%%/%%GUILE_VER%%/oop/goops/internal.scm %%DATADIR%%/%%GUILE_VER%%/oop/goops/save.scm %%DATADIR%%/%%GUILE_VER%%/oop/goops/simple.scm %%DATADIR%%/%%GUILE_VER%%/oop/goops/stklos.scm -%%DATADIR%%/%%GUILE_VER%%/oop/goops/util.scm %%DATADIR%%/%%GUILE_VER%%/rnrs.scm %%DATADIR%%/%%GUILE_VER%%/rnrs/arithmetic/bitwise.scm %%DATADIR%%/%%GUILE_VER%%/rnrs/arithmetic/fixnums.scm @@ -614,6 +691,7 @@ share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-67.scm %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-67/compare.scm %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-69.scm +%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-71.scm %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-8.scm %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-88.scm %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-9.scm @@ -644,6 +722,7 @@ share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/system/base/syntax.scm %%DATADIR%%/%%GUILE_VER%%/system/base/target.scm %%DATADIR%%/%%GUILE_VER%%/system/base/types.scm +%%DATADIR%%/%%GUILE_VER%%/system/foreign-object.scm %%DATADIR%%/%%GUILE_VER%%/system/foreign.scm %%DATADIR%%/%%GUILE_VER%%/system/repl/command.scm %%DATADIR%%/%%GUILE_VER%%/system/repl/common.scm @@ -653,11 +732,17 @@ share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/system/repl/error-handling.scm %%DATADIR%%/%%GUILE_VER%%/system/repl/repl.scm %%DATADIR%%/%%GUILE_VER%%/system/repl/server.scm +%%DATADIR%%/%%GUILE_VER%%/system/syntax.scm +%%DATADIR%%/%%GUILE_VER%%/system/vm/assembler.scm %%DATADIR%%/%%GUILE_VER%%/system/vm/coverage.scm +%%DATADIR%%/%%GUILE_VER%%/system/vm/debug.scm +%%DATADIR%%/%%GUILE_VER%%/system/vm/disassembler.scm +%%DATADIR%%/%%GUILE_VER%%/system/vm/dwarf.scm +%%DATADIR%%/%%GUILE_VER%%/system/vm/elf.scm %%DATADIR%%/%%GUILE_VER%%/system/vm/frame.scm %%DATADIR%%/%%GUILE_VER%%/system/vm/inspect.scm -%%DATADIR%%/%%GUILE_VER%%/system/vm/instruction.scm -%%DATADIR%%/%%GUILE_VER%%/system/vm/objcode.scm +%%DATADIR%%/%%GUILE_VER%%/system/vm/linker.scm +%%DATADIR%%/%%GUILE_VER%%/system/vm/loader.scm %%DATADIR%%/%%GUILE_VER%%/system/vm/program.scm %%DATADIR%%/%%GUILE_VER%%/system/vm/trace.scm %%DATADIR%%/%%GUILE_VER%%/system/vm/trap-state.scm diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile index b234451353ee..7a3247ee2a60 100644 --- a/lang/mdk/Makefile +++ b/lang/mdk/Makefile @@ -3,7 +3,7 @@ PORTNAME= mdk PORTVERSION= 1.2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang gnome MASTER_SITES= GNU/${PORTNAME}/v${PORTVERSION} @@ -29,7 +29,7 @@ GLADE_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ GLADE_USE= GNOME=cairo,gdkpixbuf2,libglade2 GUILE_CONFIGURE_WITH= guile -GUILE_LIB_DEPENDS= libguile-2.0.so:lang/guile2 \ +GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ libgc-threaded.so:devel/boehm-gc-threaded NLS_CONFIGURE_ENABLE= nls diff --git a/lang/slib-guile2/Makefile b/lang/slib-guile2/Makefile index 85dfdce69d80..71252d9505e1 100644 --- a/lang/slib-guile2/Makefile +++ b/lang/slib-guile2/Makefile @@ -1,9 +1,9 @@ # Created by: Kimura Fuyuki <fuyuki@nigredo.org> # $FreeBSD$ -# $MCom: ports/lang/slib-guile/Makefile,v 1.3 2006/10/13 02:32:48 marcus Exp $ PORTNAME= slib PORTVERSION= 3b4 # Keep this in sync with lang/slib +PORTREVISION= 1 CATEGORIES= lang scheme MASTER_SITES= # empty PKGNAMESUFFIX= -guile2 diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile index 3816074e083b..687c191934f3 100644 --- a/mail/mailutils/Makefile +++ b/mail/mailutils/Makefile @@ -3,6 +3,7 @@ PORTNAME= mailutils PORTVERSION= 3.7 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= GNU GNU_ALPHA @@ -48,10 +49,9 @@ GNUTLS_CONFIGURE_WITH= gnutls GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi GSSAPI_CONFIGURE_WITH= gssapi -GUILE_LIB_DEPENDS= libguile-2.0.so:lang/guile2 libgmp.so:math/gmp -GUILE_USES= pkgconfig +GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 libgmp.so:math/gmp +GUILE_USES= makeinfo pkgconfig GUILE_CONFIGURE_WITH= guile -GUILE_BROKEN= requires Guile >= 2.2.0 (see PR 229613) MH_CONFIGURE_ENABLE= mh diff --git a/mail/mailutils/pkg-plist b/mail/mailutils/pkg-plist index 997867887a9e..b79e8d59cc4d 100644 --- a/mail/mailutils/pkg-plist +++ b/mail/mailutils/pkg-plist @@ -338,8 +338,8 @@ sbin/pop3d share/aclocal/mailutils.m4 %%MH%%%%EMACS%%share/emacs/site-lisp/mailutils-mh.el %%MH%%%%EMACS%%share/emacs/site-lisp/mailutils-mh.elc -%%GUILE%%share/guile/site/mailutils/guile-procedures.txt -%%GUILE%%share/guile/site/mailutils/mailutils.scm +%%GUILE%%share/guile/site/2.2/mailutils/guile-procedures.txt +%%GUILE%%share/guile/site/2.2/mailutils/mailutils.scm %%NLS%%share/locale/ca/LC_MESSAGES/mailutils.mo %%NLS%%share/locale/da/LC_MESSAGES/mailutils.mo %%NLS%%share/locale/de/LC_MESSAGES/mailutils.mo diff --git a/mail/mu/Makefile b/mail/mu/Makefile index ae4e27a359a1..b6b5e5f2039d 100644 --- a/mail/mu/Makefile +++ b/mail/mu/Makefile @@ -4,7 +4,7 @@ PORTNAME= mu PORTVERSION= 1.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MAINTAINER= hrs@FreeBSD.org @@ -29,11 +29,15 @@ INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS GUILE OPTIONS_SUB= yes -GUILE_LIB_DEPENDS= libguile-2.0.so:lang/guile2 +GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 GUILE_USE= ldconfig=yes GUILE_CONFIGURE_ENABLE= guile GUILE_INFO= mu-guile +post-patch: + @${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \ + ${WRKSRC}/configure.ac + post-install: cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \ ${STAGEDIR}${PREFIX}/bin diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile index a9cf6fa10f8f..9a247e1d74d8 100644 --- a/math/nlopt/Makefile +++ b/math/nlopt/Makefile @@ -4,6 +4,7 @@ PORTNAME= nlopt DISTVERSIONPREFIX= v DISTVERSION= 2.6.1 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= rhurlin@gwdg.de @@ -20,7 +21,7 @@ BUILD_DEPENDS= swig3.0:devel/swig30 \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libgmp.so:math/gmp \ - libguile-2.0.so:lang/guile2 + libguile-2.2.so:lang/guile2 USES= cmake compiler:features pathfix pkgconfig python USE_LDCONFIG= yes diff --git a/math/nlopt/pkg-plist b/math/nlopt/pkg-plist index 0f585187ff08..5882539c0b0a 100644 --- a/math/nlopt/pkg-plist +++ b/math/nlopt/pkg-plist @@ -5,7 +5,7 @@ lib/cmake/nlopt/NLoptConfig.cmake lib/cmake/nlopt/NLoptConfigVersion.cmake lib/cmake/nlopt/NLoptLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/nlopt/NLoptLibraryDepends.cmake -lib/guile/2.0/extensions/nlopt_guile.so +lib/guile/2.2/extensions/nlopt_guile.so lib/libnlopt.so lib/libnlopt.so.0 lib/libnlopt.so.0.10.0 @@ -15,4 +15,4 @@ libdata/pkgconfig/nlopt.pc man/man3/nlopt.3.gz man/man3/nlopt_minimize.3.gz man/man3/nlopt_minimize_constrained.3.gz -share/guile/site/2.0/nlopt.scm +share/guile/site/2.2/nlopt.scm diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile index ca98748f2144..8a13eadb1ae4 100644 --- a/net-im/freetalk/Makefile +++ b/net-im/freetalk/Makefile @@ -4,7 +4,7 @@ PORTNAME= freetalk PORTVERSION= 4.1 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-im MAINTAINER= ports@FreeBSD.org @@ -14,7 +14,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth \ - libguile-2.0.so:lang/guile2 \ + libguile-2.2.so:lang/guile2 \ libgc-threaded.so:devel/boehm-gc-threaded USES= autoreconf gettext-runtime localbase makeinfo pkgconfig readline @@ -26,4 +26,8 @@ GH_ACCOUNT= GNUFreetalk INFO= freetalk +post-patch: + @${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \ + ${WRKSRC}/configure.ac + .include <bsd.port.mk> diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile index d97abe811f50..4b3544db5059 100644 --- a/net/gnu-dico/Makefile +++ b/net/gnu-dico/Makefile @@ -3,7 +3,7 @@ PORTNAME= dico PORTVERSION= 2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net textproc MASTER_SITES= GNU PKGNAMEPREFIX= gnu- @@ -33,7 +33,7 @@ PYTHON_USES= python PYTHON_CONFIGURE_ENV= PYTHON_CONFIG=${PYTHON_CMD}-config PYTHON_CONFIGURE_OFF= --without-python -GUILE_LIB_DEPENDS= libguile-2.0.so:lang/guile2 +GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 GUILE_CONFIGURE_OFF= --without-guile PCRE_LIB_DEPENDS= libpcre.so:devel/pcre diff --git a/science/harminv/Makefile b/science/harminv/Makefile index 63050f075dc0..2fcebcaf38de 100644 --- a/science/harminv/Makefile +++ b/science/harminv/Makefile @@ -3,14 +3,14 @@ PORTNAME= harminv PORTVERSION= 1.3.1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= science MASTER_SITES= http://ab-initio.mit.edu/harminv/ MAINTAINER= devel@stasyan.com COMMENT= Solver of harmonic inversion -LIB_DEPENDS+= libguile-2.0.so:lang/guile2 +LIB_DEPENDS= libguile-2.2.so:lang/guile2 USES= blaslapack fortran gmake libtool pathfix GNU_CONFIGURE= yes diff --git a/science/libctl/Makefile b/science/libctl/Makefile index 97e454b89584..a19b6e85562b 100644 --- a/science/libctl/Makefile +++ b/science/libctl/Makefile @@ -3,7 +3,7 @@ PORTNAME= libctl PORTVERSION= 3.2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science math MASTER_SITES= http://ab-initio.mit.edu/libctl/ @@ -12,7 +12,7 @@ COMMENT= Control Language Library LICENSE= GPLv2 -LIB_DEPENDS= libguile-2.0.so:lang/guile2 +LIB_DEPENDS= libguile-2.2.so:lang/guile2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared diff --git a/science/meep/Makefile b/science/meep/Makefile index 731924479616..0708fc55c111 100644 --- a/science/meep/Makefile +++ b/science/meep/Makefile @@ -13,11 +13,13 @@ COMMENT= FDTD simulation software to model electromagnetic systems LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN= very old version, incompatible with Guile 2.2 + BUILD_DEPENDS= harminv:science/harminv \ gsed:textproc/gsed LIB_DEPENDS= libfftw3.so:math/fftw3 \ libblas.so:math/blas \ - libguile-2.0.so:lang/guile2 \ + libguile-2.2.so:lang/guile2 \ libctl.so:science/libctl \ libgc-threaded.so:devel/boehm-gc-threaded \ libgsl.so:math/gsl \ diff --git a/science/mpb/Makefile b/science/mpb/Makefile index bf8d7f816304..cc437881fd5a 100644 --- a/science/mpb/Makefile +++ b/science/mpb/Makefile @@ -3,7 +3,7 @@ PORTNAME= mpb PORTVERSION= 1.5 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= science MASTER_SITES= http://ab-initio.mit.edu/mpb/ @@ -16,7 +16,7 @@ BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libfftw.so:math/fftw \ libhdf5.so:science/hdf5 \ libctl.so:science/libctl \ - libguile-2.0.so:lang/guile2 + libguile-2.2.so:lang/guile2 OPTIONS_DEFINE= ATLAS NLOPT ATLAS_DESC= Use math/atlas instead of math/lapack diff --git a/sysutils/mcron/Makefile b/sysutils/mcron/Makefile index 3f4d8d849790..bc29b48d6141 100644 --- a/sysutils/mcron/Makefile +++ b/sysutils/mcron/Makefile @@ -3,15 +3,14 @@ PORTNAME= mcron PORTVERSION= 1.0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= GNU MAINTAINER= johans@FreeBSD.org COMMENT= 100% compatible replacement for Vixie cron -RUN_DEPENDS= guile2>=2.0:lang/guile2 -BUILD_DEPENDS= ${RUN_DEPENDS} +LIB_DEPENDS= libguile-2.2.so:lang/guile2 USES= pkgconfig GNU_CONFIGURE= yes @@ -19,4 +18,8 @@ MAKEFILE= makefile INFO= mcron +post-patch: + @${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \ + ${WRKSRC}/configure + .include <bsd.port.mk> |