Re: [maintainer update] chicken-5.3.0

Timo Myyrä <timo.myyra@bittivirhe.fi> writes:

> [...]
>
> yeah, better safe than sorry. Here's fixed diff with bumped major
> version:

committed, thanks!

> diff 1c7cb3a469cd4eafc1a5285d791d86da4f5c86b5 /usr/ports
> blob - 2f597d8a02ca3a374834eea760842bda0da788ff
> file + lang/chicken/Makefile.inc
> --- lang/chicken/Makefile.inc
> +++ lang/chicken/Makefile.inc
> @@ -2,7 +2,7 @@
>
> COMMENT= practical and portable Scheme system
>
> -V= 5.2.0
> +V= 5.3.0
> DISTNAME= chicken-${V}
>
> MAINTAINER= Timo Myyra <timo.myyra@bittivirhe.fi>
> blob - 3ab250efefd57c869a9e4572bbd6b414496432af
> file + lang/chicken/bootstrap/distinfo
> --- lang/chicken/bootstrap/distinfo
> +++ lang/chicken/bootstrap/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
> -SIZE (chicken-5.2.0.tar.gz) = 4052305
> +SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
> +SIZE (chicken-5.3.0.tar.gz) = 4069549
> blob - 1dbda52c7782bf0ee97e43d9d265c52970626f54
> file + lang/chicken/core/Makefile
> --- lang/chicken/core/Makefile
> +++ lang/chicken/core/Makefile
> @@ -1,6 +1,6 @@
> # $OpenBSD: Makefile,v 1.15 2020/03/03 10:27:40 semarie Exp $
>
> -SHARED_LIBS= chicken 7.1 # 11
> +SHARED_LIBS= chicken 8.0 # 11
>
> TEST_TARGET= check
> TEST_DEPENDS= ${BUILD_PKGPATH}
> blob - 3ab250efefd57c869a9e4572bbd6b414496432af
> file + lang/chicken/core/distinfo
> --- lang/chicken/core/distinfo
> +++ lang/chicken/core/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
> -SIZE (chicken-5.2.0.tar.gz) = 4052305
> +SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
> +SIZE (chicken-5.3.0.tar.gz) = 4069549
> blob - 6bac523099a1c4fa479713dcf143a2dd21c0278d
> file + lang/chicken/core/patches/patch-Makefile_bsd
> --- lang/chicken/core/patches/patch-Makefile_bsd
> +++ lang/chicken/core/patches/patch-Makefile_bsd
> @@ -1,15 +1,14 @@
> -$OpenBSD: patch-Makefile_bsd,v 1.3 2015/08/27 22:40:33 juanfra Exp $
> ---- Makefile.bsd.orig Tue Aug 4 21:46:22 2015
> -+++ Makefile.bsd Thu Aug 27 19:11:22 2015
> -@@ -45,10 +45,9 @@ endif
> +$OpenBSD$
> +
> +Index: Makefile.bsd
> +--- Makefile.bsd.orig
> ++++ Makefile.bsd
> +@@ -45,7 +45,7 @@ endif
> LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
> - LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-R"$(RUNTIME_LINKER_PATH)" -Wl,-L.
> - LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R"$(RUNTIME_LINKER_PATH)"
> + LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-rpath="$(RUNTIME_LINKER_PATH)" -Wl,-L.
> + LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-rpath="$(RUNTIME_LINKER_PATH)"
> -LIBCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(BINARYVERSION)
> +LIBCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(LIBchicken_VERSION)
> LIBRARIES = -lm -lpthread
> NEEDS_RELINKING = yes
> --USES_SONAME = yes
> -
> - # special files
> -
> + USES_SONAME = yes
> blob - 1eb6d105f8bc5a3f41e236e895421d3059024053
> file + lang/chicken/core/patches/patch-eval_scm
> --- lang/chicken/core/patches/patch-eval_scm
> +++ lang/chicken/core/patches/patch-eval_scm
> @@ -2,7 +2,7 @@ $OpenBSD: patch-eval_scm,v 1.5 2019/08/06 18:19:51 jua
> Index: eval.scm
> --- eval.scm.orig
> +++ eval.scm
> -@@ -1110,8 +1110,7 @@
> +@@ -1115,8 +1115,7 @@
> (if uses-soname?
> (string-append
> load-library-extension
> blob - 4db8809563264170fb4632094112ff5be8296166
> file + lang/chicken/core/patches/patch-rules_make
> --- lang/chicken/core/patches/patch-rules_make
> +++ lang/chicken/core/patches/patch-rules_make
> @@ -12,3 +12,31 @@ Index: rules.make
> $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_LINKER_OPTIONS) \
> $(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES)
> ifdef USES_SONAME
> +@@ -281,9 +281,6 @@ ifdef DLLSINPATH
> + $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(IBINDIR)"
> + else
> + ifdef USES_SONAME
> +- $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE).$(BINARYVERSION)"
> +- cd "$(DESTDIR)$(ILIBDIR)" && ln -sf $(LIBCHICKEN_SO_FILE).$(BINARYVERSION) lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)
> +-else
> + $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE)"
> + endif
> + endif
> +@@ -415,7 +412,7 @@ uninstall:
> + $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(A)"
> + $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
> + ifdef USES_SONAME
> +- -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO).$(BINARYVERSION)"
> ++ -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
> + endif
> + ifdef WINDOWS
> + $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(IBINDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
> +@@ -972,7 +969,7 @@ clean:
> + $(foreach lib,$(DYNAMIC_IMPORT_LIBRARIES),chicken.$(lib).import.scm) \
> + $(BUILD_CONFIG_FILES)
> + ifdef USES_SONAME
> +- -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(BINARYVERSION)
> ++ -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(LIB_chickenVERSION)
> + endif
> +
> + confclean: