Index: Makefile =================================================================== RCS file: /cvs/ports/lang/crystal/Makefile,v retrieving revision 1.20 diff -u -p -u -p -r1.20 Makefile --- Makefile 9 Feb 2023 23:28:20 -0000 1.20 +++ Makefile 8 Jun 2023 13:48:26 -0000 @@ -1,11 +1,8 @@ -# https://github.com/crystal-lang/crystal/issues/12743 -#BROKEN = No LLVM 15 support - # Hopefully ${CLANG_ARCHS} at some point. ONLY_FOR_ARCHS= amd64 -V = 1.4.1 -V_SHARDS = 0.17.0 +V = 1.8.2 +V_SHARDS = 0.17.3 V_MOLINILLO = 0.2.0 COMMENT = statically typed object oriented language DISTNAME = crystal-${V} @@ -17,7 +14,7 @@ MAINTAINER = joshua stein <j...@jcs.org> # Apache 2.0 PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} c event_core gc iconv m pcre yaml-0 +WANTLIB += ${COMPILER_LIBCXX} c event_core gc iconv m pcre2-8 yaml-0 # # crystal-X-OpenBSDX.X.tar.gz is an archive of a bootstrap compiler object @@ -25,7 +22,7 @@ WANTLIB += ${COMPILER_LIBCXX} c event_co # current version of Crystal there, then checking out the source for that # version, applying patches included in this port, and running: # -# make crystal FLAGS="--cross-compile --target amd64-unknown-openbsd7.1" +# make crystal FLAGS="--cross-compile --target amd64-unknown-openbsd7.3" # # The result will be built at .build/crystal.o # @@ -35,7 +32,7 @@ MASTER_SITES0 = https://jcs.org/distfile MASTER_SITES1 = https://github.com/crystal-lang/shards/archive/ MASTER_SITES2 = https://github.com/crystal-lang/crystal-molinillo/archive/ DISTFILES = crystal-${V}{${V}}.tar.gz \ - crystal-${V}-OpenBSD7.1.tar.gz:0 \ + crystal-${V}-OpenBSD7.3.tar.gz:0 \ shards-${V}{v${V_SHARDS}}.tar.gz:1 \ crystal-molinillo-${V}{v${V_MOLINILLO}}.tar.gz:2 @@ -43,13 +40,14 @@ DISTFILES = crystal-${V}{${V}}.tar.gz \ COMPILER = ports-clang LLVM_CONFIG = ${LOCALBASE}/bin/llvm-config -BUILD_DEPENDS = devel/llvm +BUILD_DEPENDS = devel/llvm \ + shells/bash RUN_DEPENDS = devel/llvm,-main LIB_DEPENDS = converters/libiconv \ devel/boehm-gc \ devel/libevent2 \ - devel/pcre \ + devel/pcre2 \ devel/libyaml USE_GMAKE = Yes @@ -71,7 +69,7 @@ do-build: ${WRKSRC}/../crystal.o \ ${WRKSRC}/src/llvm/ext/llvm_ext.o \ `(${LLVM_CONFIG} --libs --system-libs --ldflags 2> /dev/null)` \ - -liconv -lpcre -levent_core -lgc -lyaml + -liconv -lpcre2-8 -levent_core -lgc -lyaml cd ${WRKSRC}/shards-${V_SHARDS} && \ env CRYSTAL_PATH=lib:${WRKSRC}/src:${WRKSRC}/crystal-molinillo-${V_MOLINILLO}/src \ CRYSTAL=${WRKSRC}/.build/crystal \ @@ -88,7 +86,7 @@ do-install: do-test: cd ${WRKSRC}; \ - ulimit -s 5120 -d 4096000 && \ + ulimit -s 9680 -d 8096000 && \ ${MAKE_PROGRAM} ${TEST_TARGET} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/lang/crystal/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo 26 Apr 2022 15:44:52 -0000 1.10 +++ distinfo 8 Jun 2023 13:48:26 -0000 @@ -1,8 +1,8 @@ -SHA256 (crystal-1.4.1-OpenBSD7.1.tar.gz) = IGlOAkDwUqwugcVoQe/xgO+Mr6TbZBKOU+Krt4fPdjQ= -SHA256 (crystal-1.4.1.tar.gz) = l0ZmVq3t4ZlDYZ4YrwMMHVQsLD3R8286QiMQvYtT9eA= -SHA256 (crystal-molinillo-1.4.1.tar.gz) = 4jHPJBGmoRoVOJg8f7UrGeZQrMMzi9PN9v2xPWRjhho= -SHA256 (shards-1.4.1.tar.gz) = s/CiJhQ3shs+JGW3dV7fDDPwMFoRK9mjbhs+x0+WsJg= -SIZE (crystal-1.4.1-OpenBSD7.1.tar.gz) = 8986175 -SIZE (crystal-1.4.1.tar.gz) = 2880860 -SIZE (crystal-molinillo-1.4.1.tar.gz) = 23959 -SIZE (shards-1.4.1.tar.gz) = 71264 +SHA256 (crystal-1.8.2-OpenBSD7.3.tar.gz) = lIh8W8YYkSmJKNoPA4IjpZN/wjzF01quAt9gmIRT81s= +SHA256 (crystal-1.8.2.tar.gz) = bnIuMjmoxGe6QqiDiRZ4ikeVsM6qLR4umGFs7etUBgU= +SHA256 (crystal-molinillo-1.8.2.tar.gz) = 4jHPJBGmoRoVOJg8f7UrGeZQrMMzi9PN9v2xPWRjhho= +SHA256 (shards-1.8.2.tar.gz) = ZRL/Ub1pBX9NpHg+trFMKdmoi5fTWYU1bR3GRKCEJMc= +SIZE (crystal-1.8.2-OpenBSD7.3.tar.gz) = 9474479 +SIZE (crystal-1.8.2.tar.gz) = 3171583 +SIZE (crystal-molinillo-1.8.2.tar.gz) = 23959 +SIZE (shards-1.8.2.tar.gz) = 72539 Index: patches/patch-bin_crystal =================================================================== RCS file: patches/patch-bin_crystal diff -N patches/patch-bin_crystal --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-bin_crystal 8 Jun 2023 13:48:26 -0000 @@ -0,0 +1,8 @@ +--- bin/crystal.orig Wed Jun 7 17:35:23 2023 ++++ bin/crystal Wed Jun 7 17:35:31 2023 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/local/bin/bash + + ################## https://github.com/mkropat/sh-realpath ##################### + # Index: patches/patch-src_compiler_crystal_compiler_cr =================================================================== RCS file: /cvs/ports/lang/crystal/patches/patch-src_compiler_crystal_compiler_cr,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-src_compiler_crystal_compiler_cr --- patches/patch-src_compiler_crystal_compiler_cr 13 Apr 2022 13:55:10 -0000 1.3 +++ patches/patch-src_compiler_crystal_compiler_cr 8 Jun 2023 13:48:26 -0000 @@ -3,7 +3,7 @@ Index: src/compiler/crystal/compiler.cr --- src/compiler/crystal/compiler.cr.orig +++ src/compiler/crystal/compiler.cr -@@ -365,6 +365,9 @@ module Crystal +@@ -386,6 +386,9 @@ module Crystal else link_flags = @link_flags || "" link_flags += " -rdynamic" @@ -11,5 +11,5 @@ Index: src/compiler/crystal/compiler.cr + link_flags += " -L/usr/local/lib" + end - { %(#{CC} "${@}" -o #{Process.quote_posix(output_filename)} #{link_flags} #{program.lib_flags}), object_names } + {CC, %(#{CC} "${@}" -o #{Process.quote_posix(output_filename)} #{link_flags} #{program.lib_flags}), object_names} end Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/crystal/pkg/PLIST,v retrieving revision 1.9 diff -u -p -u -p -r1.9 PLIST --- pkg/PLIST 13 Apr 2022 13:55:10 -0000 1.9 +++ pkg/PLIST 8 Jun 2023 13:48:27 -0000 @@ -90,6 +90,7 @@ lib/crystal/compiler/crystal/interpreter lib/crystal/compiler/crystal/interpreter/cast.cr lib/crystal/compiler/crystal/interpreter/class_vars.cr lib/crystal/compiler/crystal/interpreter/closure.cr +lib/crystal/compiler/crystal/interpreter/closure_context.cr lib/crystal/compiler/crystal/interpreter/compiled_block.cr lib/crystal/compiler/crystal/interpreter/compiled_def.cr lib/crystal/compiler/crystal/interpreter/compiled_instructions.cr @@ -109,17 +110,21 @@ lib/crystal/compiler/crystal/interpreter lib/crystal/compiler/crystal/interpreter/multidispatch.cr lib/crystal/compiler/crystal/interpreter/op_code.cr lib/crystal/compiler/crystal/interpreter/primitives.cr +lib/crystal/compiler/crystal/interpreter/pry_reader.cr lib/crystal/compiler/crystal/interpreter/repl.cr +lib/crystal/compiler/crystal/interpreter/repl_reader.cr lib/crystal/compiler/crystal/interpreter/to_bool.cr lib/crystal/compiler/crystal/interpreter/value.cr lib/crystal/compiler/crystal/loader/ lib/crystal/compiler/crystal/loader.cr +lib/crystal/compiler/crystal/loader/msvc.cr lib/crystal/compiler/crystal/loader/unix.cr lib/crystal/compiler/crystal/macros/ lib/crystal/compiler/crystal/macros.cr lib/crystal/compiler/crystal/macros/interpreter.cr lib/crystal/compiler/crystal/macros/macros.cr lib/crystal/compiler/crystal/macros/methods.cr +lib/crystal/compiler/crystal/macros/types.cr lib/crystal/compiler/crystal/program.cr lib/crystal/compiler/crystal/progress_tracker.cr lib/crystal/compiler/crystal/semantic/ @@ -153,6 +158,7 @@ lib/crystal/compiler/crystal/semantic/no lib/crystal/compiler/crystal/semantic/path_lookup.cr lib/crystal/compiler/crystal/semantic/recursive_struct_checker.cr lib/crystal/compiler/crystal/semantic/restrictions.cr +lib/crystal/compiler/crystal/semantic/restrictions_augmenter.cr lib/crystal/compiler/crystal/semantic/semantic_visitor.cr lib/crystal/compiler/crystal/semantic/suggestions.cr lib/crystal/compiler/crystal/semantic/to_s.cr @@ -164,6 +170,7 @@ lib/crystal/compiler/crystal/semantic/ty lib/crystal/compiler/crystal/semantic/type_intersect.cr lib/crystal/compiler/crystal/semantic/type_lookup.cr lib/crystal/compiler/crystal/semantic/type_merge.cr +lib/crystal/compiler/crystal/semantic/type_to_restriction.cr lib/crystal/compiler/crystal/semantic/warnings.cr lib/crystal/compiler/crystal/syntax/ lib/crystal/compiler/crystal/syntax.cr @@ -280,6 +287,7 @@ lib/crystal/compiler/crystal/tools/table lib/crystal/compiler/crystal/tools/typed_def_processor.cr lib/crystal/compiler/crystal/types.cr lib/crystal/compiler/crystal/util.cr +lib/crystal/compiler/crystal/warnings.cr lib/crystal/compiler/requires.cr lib/crystal/complex.cr lib/crystal/compress/ @@ -316,6 +324,7 @@ lib/crystal/crypto/blowfish.cr lib/crystal/crypto/subtle.cr lib/crystal/crystal/ lib/crystal/crystal/at_exit_handlers.cr +lib/crystal/crystal/atomic_semaphore.cr lib/crystal/crystal/compiler_rt/ lib/crystal/crystal/compiler_rt.cr lib/crystal/crystal/compiler_rt/divmod128.cr @@ -323,6 +332,8 @@ lib/crystal/crystal/compiler_rt/fixint.c lib/crystal/crystal/compiler_rt/float.cr lib/crystal/crystal/compiler_rt/mul.cr lib/crystal/crystal/compiler_rt/multi3.cr +lib/crystal/crystal/compiler_rt/pow.cr +lib/crystal/crystal/compiler_rt/shift.cr lib/crystal/crystal/datum.cr lib/crystal/crystal/digest/ lib/crystal/crystal/digest/md5.cr @@ -365,8 +376,10 @@ lib/crystal/crystal/system/path.cr lib/crystal/crystal/system/print_error.cr lib/crystal/crystal/system/process.cr lib/crystal/crystal/system/random.cr +lib/crystal/crystal/system/signal.cr lib/crystal/crystal/system/socket.cr lib/crystal/crystal/system/thread.cr +lib/crystal/crystal/system/thread_condition_variable.cr lib/crystal/crystal/system/thread_linked_list.cr lib/crystal/crystal/system/thread_mutex.cr lib/crystal/crystal/system/time.cr @@ -391,6 +404,7 @@ lib/crystal/crystal/system/unix/process. lib/crystal/crystal/system/unix/pthread.cr lib/crystal/crystal/system/unix/pthread_condition_variable.cr lib/crystal/crystal/system/unix/pthread_mutex.cr +lib/crystal/crystal/system/unix/signal.cr lib/crystal/crystal/system/unix/socket.cr lib/crystal/crystal/system/unix/syscall.cr lib/crystal/crystal/system/unix/sysconf_cpucount.cr @@ -413,13 +427,16 @@ lib/crystal/crystal/system/wasi/main.cr lib/crystal/crystal/system/wasi/path.cr lib/crystal/crystal/system/wasi/process.cr lib/crystal/crystal/system/wasi/random.cr +lib/crystal/crystal/system/wasi/signal.cr lib/crystal/crystal/system/wasi/socket.cr lib/crystal/crystal/system/wasi/thread.cr +lib/crystal/crystal/system/wasi/thread_condition_variable.cr lib/crystal/crystal/system/wasi/thread_mutex.cr lib/crystal/crystal/system/wasi/user.cr lib/crystal/crystal/system/wasi/wasi.cr lib/crystal/crystal/system/win32/ lib/crystal/crystal/system/win32/cpucount.cr +lib/crystal/crystal/system/win32/crypto.cr lib/crystal/crystal/system/win32/dir.cr lib/crystal/crystal/system/win32/env.cr lib/crystal/crystal/system/win32/event_loop_iocp.cr @@ -428,12 +445,15 @@ lib/crystal/crystal/system/win32/file.cr lib/crystal/crystal/system/win32/file_descriptor.cr lib/crystal/crystal/system/win32/file_info.cr lib/crystal/crystal/system/win32/hostname.cr +lib/crystal/crystal/system/win32/library_archive.cr lib/crystal/crystal/system/win32/mime.cr lib/crystal/crystal/system/win32/path.cr lib/crystal/crystal/system/win32/process.cr lib/crystal/crystal/system/win32/random.cr +lib/crystal/crystal/system/win32/signal.cr lib/crystal/crystal/system/win32/socket.cr lib/crystal/crystal/system/win32/thread.cr +lib/crystal/crystal/system/win32/thread_condition_variable.cr lib/crystal/crystal/system/win32/thread_mutex.cr lib/crystal/crystal/system/win32/time.cr lib/crystal/crystal/system/win32/visual_studio.cr @@ -517,6 +537,8 @@ lib/crystal/float/printer/ lib/crystal/float/printer.cr lib/crystal/float/printer/cached_powers.cr lib/crystal/float/printer/diy_fp.cr +lib/crystal/float/printer/dragonbox.cr +lib/crystal/float/printer/dragonbox_cache.cr lib/crystal/float/printer/grisu3.cr lib/crystal/float/printer/ieee.cr lib/crystal/gc/ @@ -607,6 +629,47 @@ lib/crystal/kernel.cr lib/crystal/levenshtein.cr lib/crystal/lib_c/ lib/crystal/lib_c.cr +lib/crystal/lib_c/aarch64-android/ +lib/crystal/lib_c/aarch64-android/c/ +lib/crystal/lib_c/aarch64-android/c/arpa/ +lib/crystal/lib_c/aarch64-android/c/arpa/inet.cr +lib/crystal/lib_c/aarch64-android/c/dirent.cr +lib/crystal/lib_c/aarch64-android/c/dlfcn.cr +lib/crystal/lib_c/aarch64-android/c/elf.cr +lib/crystal/lib_c/aarch64-android/c/errno.cr +lib/crystal/lib_c/aarch64-android/c/fcntl.cr +lib/crystal/lib_c/aarch64-android/c/grp.cr +lib/crystal/lib_c/aarch64-android/c/iconv.cr +lib/crystal/lib_c/aarch64-android/c/link.cr +lib/crystal/lib_c/aarch64-android/c/netdb.cr +lib/crystal/lib_c/aarch64-android/c/netinet/ +lib/crystal/lib_c/aarch64-android/c/netinet/in.cr +lib/crystal/lib_c/aarch64-android/c/netinet/tcp.cr +lib/crystal/lib_c/aarch64-android/c/pthread.cr +lib/crystal/lib_c/aarch64-android/c/pwd.cr +lib/crystal/lib_c/aarch64-android/c/sched.cr +lib/crystal/lib_c/aarch64-android/c/signal.cr +lib/crystal/lib_c/aarch64-android/c/stdarg.cr +lib/crystal/lib_c/aarch64-android/c/stddef.cr +lib/crystal/lib_c/aarch64-android/c/stdint.cr +lib/crystal/lib_c/aarch64-android/c/stdio.cr +lib/crystal/lib_c/aarch64-android/c/stdlib.cr +lib/crystal/lib_c/aarch64-android/c/string.cr +lib/crystal/lib_c/aarch64-android/c/sys/ +lib/crystal/lib_c/aarch64-android/c/sys/file.cr +lib/crystal/lib_c/aarch64-android/c/sys/mman.cr +lib/crystal/lib_c/aarch64-android/c/sys/resource.cr +lib/crystal/lib_c/aarch64-android/c/sys/select.cr +lib/crystal/lib_c/aarch64-android/c/sys/socket.cr +lib/crystal/lib_c/aarch64-android/c/sys/stat.cr +lib/crystal/lib_c/aarch64-android/c/sys/syscall.cr +lib/crystal/lib_c/aarch64-android/c/sys/time.cr +lib/crystal/lib_c/aarch64-android/c/sys/types.cr +lib/crystal/lib_c/aarch64-android/c/sys/un.cr +lib/crystal/lib_c/aarch64-android/c/sys/wait.cr +lib/crystal/lib_c/aarch64-android/c/termios.cr +lib/crystal/lib_c/aarch64-android/c/time.cr +lib/crystal/lib_c/aarch64-android/c/unistd.cr lib/crystal/lib_c/aarch64-darwin/ lib/crystal/lib_c/aarch64-darwin/c/ lib/crystal/lib_c/aarch64-darwin/c/arpa/ @@ -1194,12 +1257,17 @@ lib/crystal/lib_c/x86_64-windows-msvc/c/ lib/crystal/lib_c/x86_64-windows-msvc/c/memoryapi.cr lib/crystal/lib_c/x86_64-windows-msvc/c/minwinbase.cr lib/crystal/lib_c/x86_64-windows-msvc/c/mswsock.cr +lib/crystal/lib_c/x86_64-windows-msvc/c/ntifs.cr lib/crystal/lib_c/x86_64-windows-msvc/c/ntsecapi.cr +lib/crystal/lib_c/x86_64-windows-msvc/c/ntstatus.cr +lib/crystal/lib_c/x86_64-windows-msvc/c/process.cr lib/crystal/lib_c/x86_64-windows-msvc/c/processenv.cr lib/crystal/lib_c/x86_64-windows-msvc/c/processthreadsapi.cr lib/crystal/lib_c/x86_64-windows-msvc/c/profileapi.cr lib/crystal/lib_c/x86_64-windows-msvc/c/regapix.cr +lib/crystal/lib_c/x86_64-windows-msvc/c/sdkddkver.cr lib/crystal/lib_c/x86_64-windows-msvc/c/shlobj_core.cr +lib/crystal/lib_c/x86_64-windows-msvc/c/signal.cr lib/crystal/lib_c/x86_64-windows-msvc/c/stdarg.cr lib/crystal/lib_c/x86_64-windows-msvc/c/stddef.cr lib/crystal/lib_c/x86_64-windows-msvc/c/stdint.cr @@ -1214,9 +1282,12 @@ lib/crystal/lib_c/x86_64-windows-msvc/c/ lib/crystal/lib_c/x86_64-windows-msvc/c/sys/utime.cr lib/crystal/lib_c/x86_64-windows-msvc/c/sysinfoapi.cr lib/crystal/lib_c/x86_64-windows-msvc/c/timezoneapi.cr +lib/crystal/lib_c/x86_64-windows-msvc/c/tlhelp32.cr lib/crystal/lib_c/x86_64-windows-msvc/c/win_def.cr lib/crystal/lib_c/x86_64-windows-msvc/c/winbase.cr +lib/crystal/lib_c/x86_64-windows-msvc/c/wincrypt.cr lib/crystal/lib_c/x86_64-windows-msvc/c/windows.cr +lib/crystal/lib_c/x86_64-windows-msvc/c/winioctl.cr lib/crystal/lib_c/x86_64-windows-msvc/c/winnls.cr lib/crystal/lib_c/x86_64-windows-msvc/c/winnt.cr lib/crystal/lib_c/x86_64-windows-msvc/c/winreg.cr @@ -1242,7 +1313,9 @@ lib/crystal/llvm/basic_block_collection. lib/crystal/llvm/builder.cr lib/crystal/llvm/context.cr lib/crystal/llvm/di_builder.cr +lib/crystal/llvm/enums/ lib/crystal/llvm/enums.cr +lib/crystal/llvm/enums/atomic.cr lib/crystal/llvm/ext/ lib/crystal/llvm/ext/find-llvm-config lib/crystal/llvm/ext/llvm-versions.txt @@ -1262,6 +1335,7 @@ lib/crystal/llvm/module.cr lib/crystal/llvm/module_pass_manager.cr lib/crystal/llvm/operand_bundle_def.cr lib/crystal/llvm/parameter_collection.cr +lib/crystal/llvm/pass_builder_options.cr lib/crystal/llvm/pass_manager_builder.cr lib/crystal/llvm/pass_registry.cr lib/crystal/llvm/phi_table.cr @@ -1373,8 +1447,12 @@ lib/crystal/range/bsearch.cr lib/crystal/reference.cr lib/crystal/regex/ lib/crystal/regex.cr +lib/crystal/regex/engine.cr lib/crystal/regex/lib_pcre.cr +lib/crystal/regex/lib_pcre2.cr lib/crystal/regex/match_data.cr +lib/crystal/regex/pcre.cr +lib/crystal/regex/pcre2.cr lib/crystal/semantic_version.cr lib/crystal/set.cr lib/crystal/signal.cr @@ -1478,7 +1556,6 @@ lib/crystal/va_list.cr lib/crystal/value.cr lib/crystal/wasi_error.cr lib/crystal/weak_ref.cr -lib/crystal/windows_stubs.cr lib/crystal/winerror.cr lib/crystal/xml/ lib/crystal/xml.cr
