On Fri, Sep 04 2026, Nemin wrote:
> Hi Timo,
>
> Thanks for your work. It's nice to see the update come to OBSD so soon
> after its release! I was eager to try 6.0 out, but it seems one of the
> patches causes an issue on my machine.
>
> I'm running the newest 8.0 snapshot (4th of September). I made attempts
> with both the 7.9 ports tree and the newest snapshot's. Went to
> /usr/ports, piped your revised patchfile into `patch` and it applied
> most of them, until it got stuck here:
>
> Patching file lang/chicken/core/patches/patch-Makefile_bsd using Plan A...
> Hunk #1 succeeded at 1 with fuzz 2.
> Hmm... The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> | LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-rpath="$(RUNTIME_LINKER_PATH)"
> --------------------------
> File to patch:
>
> At this point I was able to go one step further by entering
> lang/chicken/core/patches/patch-Makefile_bsd into the prompt, but then
> it died with the following:
>
> Patching file lang/chicken/core/patches/patch-Makefile_bsd using Plan A...
> patch: **** malformed patch at line 67: - USES_SONAME = yes
>
> The patcher seems to be confused by operating on another
> patchfile. However, once I removed this one patch, the rest applied
> without manual intervention.
>
> Here's what I removed (sorry for not using unified diff here, I feel
> it'd just cause the same problem, but on your end):
>
> 57,81d56
> < blob - b99132d32292378fe5548beb287706edc89d9cd6
> < file + lang/chicken/core/patches/patch-Makefile_bsd
> < --- lang/chicken/core/patches/patch-Makefile_bsd
> < +++ lang/chicken/core/patches/patch-Makefile_bsd
> < @@ -1,7 +1,7 @@
> < Index: Makefile.bsd
> < --- Makefile.bsd.orig
> < +++ Makefile.bsd
> < -@@ -48,7 +48,7 @@ endif
> < +@@ -48,10 +48,9 @@ endif
> < LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
> < LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared
> -Wl,-rpath="$(RUNTIME_LINKER_PATH)" \
> < -Wl,-L.
> < LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-rpath="$(RUNTIME_LINKER_PATH)"
> < @@ -9,4 +9,7 @@ Index: Makefile.bsd
> < +LIBCHICKEN_SO_LINKER_OPTIONS = \
> <
> -Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(LIBchicken_VERSION)
> < LIBRARIES = -lm -lpthread
> < NEEDS_RELINKING = yes
> < - USES_SONAME = yes
> < +-USES_SONAME = yes
> < +
> < + # special files
> < +
> < commit - 37c55a1ade7dcb3ed956cedadab2b7a71ea85742
>
> I then manually added the "-" before USES_SONAME into the
> patch-Makefile_bsd patchfile, then issued `make`, which proceeded
> without issue. Post build, I ran `make install`, which also succeeded.
>
> After that, I was able to launch chicken-csi, install stuff with
> chicken-install, and compile a test file with chicken-csc. So your
> update seems correct, but (unless I'm doing something capitally wrong)
> the patch is a little off.
>
> I hope this helps and thanks again!
>
> Best,
> Nemin
Ok, new diff.
Noticed that the rules.make patch was not updated for some reason. The
diff applied during ports build with fuzzy matching though so it was not
listed as error. I fixed that with update-patches and tested that this
diff applies cleanly to clean cvs checkout so this shouldn't contain any
issues of that sort.
timo
diff /usr/ports
path + /usr/ports
commit - c4cd4a1917009c4dc9fecb5f7aee6414f72914ae
blob - 4d52ff7e4b247f94a9423eeab4e04afe859fef34
file + lang/chicken/Makefile.inc
--- lang/chicken/Makefile.inc
+++ lang/chicken/Makefile.inc
@@ -1,6 +1,6 @@
COMMENT= practical and portable Scheme system
-V= 5.4.0
+V= 6.0.0
DISTNAME= chicken-${V}
MAINTAINER= Timo Myyra <[email protected]>
@@ -25,7 +25,7 @@ MAKE_FILE= GNUmakefile
FAKE_FLAGS= PREFIX=${TRUEPREFIX}
-BINARYVERSION= 11
+BINARYVERSION= 12
SUBST_VARS+= BINARYVERSION
# Based on param.h:MACHINE_STACK_GROWS_UP
commit - c4cd4a1917009c4dc9fecb5f7aee6414f72914ae
blob - 5c33bcc252b77a82b15ee86e9271cb8cad74c822
file + lang/chicken/bootstrap/distinfo
--- lang/chicken/bootstrap/distinfo
+++ lang/chicken/bootstrap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.4.0.tar.gz) = PF1KphwRZ79tm/nq+JHadjC6n188Fb8JUVpwOb/N7F8=
-SIZE (chicken-5.4.0.tar.gz) = 4109135
+SHA256 (chicken-6.0.0.tar.gz) = koNVUrG2h60mc35Cm1q6NlEL9Cn4gW7A9tM2yMtB9EM=
+SIZE (chicken-6.0.0.tar.gz) = 4287731
commit - c4cd4a1917009c4dc9fecb5f7aee6414f72914ae
blob - ea9f75e32e398b2a9aac2eaf42aeef2966da5602
file + lang/chicken/core/Makefile
--- lang/chicken/core/Makefile
+++ lang/chicken/core/Makefile
@@ -1,4 +1,4 @@
-SHARED_LIBS= chicken 8.1 # 11
+SHARED_LIBS= chicken 9.1 # 12
TEST_TARGET= check
TEST_DEPENDS= ${BUILD_PKGPATH}
commit - c4cd4a1917009c4dc9fecb5f7aee6414f72914ae
blob - 5c33bcc252b77a82b15ee86e9271cb8cad74c822
file + lang/chicken/core/distinfo
--- lang/chicken/core/distinfo
+++ lang/chicken/core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.4.0.tar.gz) = PF1KphwRZ79tm/nq+JHadjC6n188Fb8JUVpwOb/N7F8=
-SIZE (chicken-5.4.0.tar.gz) = 4109135
+SHA256 (chicken-6.0.0.tar.gz) = koNVUrG2h60mc35Cm1q6NlEL9Cn4gW7A9tM2yMtB9EM=
+SIZE (chicken-6.0.0.tar.gz) = 4287731
commit - c4cd4a1917009c4dc9fecb5f7aee6414f72914ae
blob - b99132d32292378fe5548beb287706edc89d9cd6
file + lang/chicken/core/patches/patch-Makefile_bsd
--- lang/chicken/core/patches/patch-Makefile_bsd
+++ lang/chicken/core/patches/patch-Makefile_bsd
@@ -1,7 +1,7 @@
Index: Makefile.bsd
--- Makefile.bsd.orig
+++ Makefile.bsd
-@@ -48,7 +48,7 @@ endif
+@@ -48,10 +48,9 @@ endif
LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared
-Wl,-rpath="$(RUNTIME_LINKER_PATH)" -Wl,-L.
LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-rpath="$(RUNTIME_LINKER_PATH)"
@@ -9,4 +9,7 @@ Index: Makefile.bsd
+LIBCHICKEN_SO_LINKER_OPTIONS =
-Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(LIBchicken_VERSION)
LIBRARIES = -lm -lpthread
NEEDS_RELINKING = yes
- USES_SONAME = yes
+-USES_SONAME = yes
+
+ # special files
+
commit - c4cd4a1917009c4dc9fecb5f7aee6414f72914ae
blob - 0ef1cc02a7a3044fb4b871cd224ab737d5aa1eea
file + lang/chicken/core/patches/patch-defaults_make
--- lang/chicken/core/patches/patch-defaults_make
+++ lang/chicken/core/patches/patch-defaults_make
@@ -24,7 +24,7 @@ Index: defaults.make
endif
endif
LIBCHICKEN_SO_LIBRARIES ?= $(LIBRARIES)
-@@ -281,8 +281,8 @@ DYNAMIC_CHICKEN_UNIT_IMPORT_LIBRARIES = continuation e
+@@ -280,8 +280,8 @@ DYNAMIC_CHICKEN_UNIT_IMPORT_LIBRARIES = continuation e
# targets
CHICKEN_PROGRAM = $(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
commit - c4cd4a1917009c4dc9fecb5f7aee6414f72914ae
blob - e8df00f8bb92484bf4ce1dc9125261ef979cdadc
file + lang/chicken/core/patches/patch-eval_scm
--- lang/chicken/core/patches/patch-eval_scm
+++ lang/chicken/core/patches/patch-eval_scm
@@ -1,11 +1,11 @@
Index: eval.scm
--- eval.scm.orig
+++ eval.scm
-@@ -1131,8 +1131,7 @@
+@@ -1148,8 +1148,7 @@
(if uses-soname?
(string-append
load-library-extension
-- "."
+- "."
- (number->string binary-version))
+ ".${LIBchicken_VERSION}")
load-library-extension)))
commit - c4cd4a1917009c4dc9fecb5f7aee6414f72914ae
blob - e6f11eb36a4a6a649f3042b4610d117a3d458201
file + lang/chicken/core/patches/patch-rules_make
--- lang/chicken/core/patches/patch-rules_make
+++ lang/chicken/core/patches/patch-rules_make
@@ -2,7 +2,7 @@ disable DESTDIR check so chicken-install will run
Index: rules.make
--- rules.make.orig
+++ rules.make
-@@ -186,7 +186,7 @@ $(foreach obj, $(UTILITY_PROGRAM_OBJECTS_1),\
+@@ -180,7 +180,7 @@ $(foreach obj, $(UTILITY_PROGRAM_OBJECTS_1),\
libs: $(TARGETLIBS)
@@ -11,7 +11,7 @@ Index: rules.make
$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_LINKER_OPTIONS) \
$(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES)
ifdef USES_SONAME
-@@ -282,9 +282,6 @@ ifdef DLLSINPATH
+@@ -272,9 +272,6 @@ ifdef DLLSINPATH
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(IBINDIR)"
else
ifdef USES_SONAME
@@ -21,8 +21,8 @@ Index: rules.make
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE)"
endif
endif
-@@ -412,7 +409,7 @@ uninstall:
- $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(A)"
+@@ -394,7 +391,7 @@ uninstall:
+ $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)-static$(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)"
@@ -30,7 +30,7 @@ Index: rules.make
endif
ifdef WINDOWS
$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(IBINDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
-@@ -977,7 +974,7 @@ clean:
+@@ -978,7 +975,7 @@ clean:
$(foreach lib,$(DYNAMIC_IMPORT_LIBRARIES),chicken.$(lib).import.scm) \
$(BUILD_CONFIG_FILES)
ifdef USES_SONAME
commit - c4cd4a1917009c4dc9fecb5f7aee6414f72914ae
blob - 4cb4876a80da3637de57ad5a2be328206f709ed2
file + lang/chicken/core/patches/patch-tests_runtests_sh
--- lang/chicken/core/patches/patch-tests_runtests_sh
+++ lang/chicken/core/patches/patch-tests_runtests_sh
@@ -1,7 +1,7 @@
Index: tests/runtests.sh
--- tests/runtests.sh.orig
+++ tests/runtests.sh
-@@ -44,10 +44,10 @@ export CHICKEN_INSTALL_REPOSITORY CHICKEN_REPOSITORY_P
+@@ -46,10 +46,10 @@ export CHICKEN_INSTALL_REPOSITORY CHICKEN_REPOSITORY_P
TYPESDB=../types.db
COMPILE_OPTIONS="-v -compiler ${CHICKEN} -I${TEST_DIR}/.. -L${TEST_DIR}/..
-include-path ${TEST_DIR}/.. -libdir ${TEST_DIR}/.. -rpath ${TEST_DIR}/.."
commit - c4cd4a1917009c4dc9fecb5f7aee6414f72914ae
blob - 3e302be17063e64b456391682b232d7776c8538b
file + lang/chicken/core/pkg/PLIST
--- lang/chicken/core/pkg/PLIST
+++ lang/chicken/core/pkg/PLIST
@@ -6,7 +6,6 @@
@bin bin/chicken-profile
@bin bin/chicken-status
@bin bin/chicken-uninstall
-bin/feathers
include/chicken/
include/chicken/chicken-config.h
include/chicken/chicken.h
@@ -14,7 +13,7 @@ lib/chicken/
lib/chicken/${BINARYVERSION}/
@so lib/chicken/${BINARYVERSION}/chicken.base.import.so
@so lib/chicken/${BINARYVERSION}/chicken.bitwise.import.so
-@so lib/chicken/${BINARYVERSION}/chicken.blob.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.bytevector.import.so
@so lib/chicken/${BINARYVERSION}/chicken.compiler.user-pass.import.so
@so lib/chicken/${BINARYVERSION}/chicken.condition.import.so
@so lib/chicken/${BINARYVERSION}/chicken.continuation.import.so
@@ -36,6 +35,7 @@ lib/chicken/${BINARYVERSION}/
@so lib/chicken/${BINARYVERSION}/chicken.locative.import.so
@so lib/chicken/${BINARYVERSION}/chicken.memory.import.so
@so lib/chicken/${BINARYVERSION}/chicken.memory.representation.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.number-vector.import.so
@so lib/chicken/${BINARYVERSION}/chicken.pathname.import.so
@so lib/chicken/${BINARYVERSION}/chicken.platform.import.so
@so lib/chicken/${BINARYVERSION}/chicken.plist.import.so
@@ -54,9 +54,14 @@ lib/chicken/${BINARYVERSION}/
@so lib/chicken/${BINARYVERSION}/chicken.tcp.import.so
@so lib/chicken/${BINARYVERSION}/chicken.time.import.so
@so lib/chicken/${BINARYVERSION}/chicken.time.posix.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.version.import.so
+@so lib/chicken/${BINARYVERSION}/scheme.file.import.so
+@so lib/chicken/${BINARYVERSION}/scheme.process-context.import.so
+@so lib/chicken/${BINARYVERSION}/scheme.time.import.so
+@so lib/chicken/${BINARYVERSION}/scheme.write.import.so
@so lib/chicken/${BINARYVERSION}/srfi-4.import.so
lib/chicken/${BINARYVERSION}/types.db
-@static-lib lib/libchicken.a
+@static-lib lib/libchicken-static.a
@lib lib/libchicken.so.${LIBchicken_VERSION}
@man man/man1/chicken-csc.1
@man man/man1/chicken-csi.1
@@ -66,9 +71,7 @@ lib/chicken/${BINARYVERSION}/types.db
@man man/man1/chicken-status.1
@man man/man1/chicken-uninstall.1
@man man/man1/chicken.1
-@man man/man1/feathers.1
share/chicken/
-share/chicken/feathers.tcl
share/chicken/setup.defaults
share/doc/chicken/
share/doc/chicken/DEPRECATED
@@ -82,7 +85,6 @@ share/doc/chicken/manual/Bugs and limitations.html
share/doc/chicken/manual/C interface.html
share/doc/chicken/manual/Cross development.html
share/doc/chicken/manual/Data representation.html
-share/doc/chicken/manual/Debugging.html
share/doc/chicken/manual/Declarations.html
share/doc/chicken/manual/Deployment.html
share/doc/chicken/manual/Deviations from the standard.html
@@ -97,7 +99,7 @@ share/doc/chicken/manual/Included modules.html
share/doc/chicken/manual/Interface to external functions and variables.html
share/doc/chicken/manual/Module (chicken base).html
share/doc/chicken/manual/Module (chicken bitwise).html
-share/doc/chicken/manual/Module (chicken blob).html
+share/doc/chicken/manual/Module (chicken bytevector).html
share/doc/chicken/manual/Module (chicken condition).html
share/doc/chicken/manual/Module (chicken continuation).html
share/doc/chicken/manual/Module (chicken csi).html
@@ -137,8 +139,24 @@ share/doc/chicken/manual/Module (chicken tcp).html
share/doc/chicken/manual/Module (chicken time posix).html
share/doc/chicken/manual/Module (chicken time).html
share/doc/chicken/manual/Module (chicken type).html
-share/doc/chicken/manual/Module r4rs.html
-share/doc/chicken/manual/Module r5rs.html
+share/doc/chicken/manual/Module (chicken version).html
+share/doc/chicken/manual/Module (scheme base).html
+share/doc/chicken/manual/Module (scheme case-lambda).html
+share/doc/chicken/manual/Module (scheme char).html
+share/doc/chicken/manual/Module (scheme complex).html
+share/doc/chicken/manual/Module (scheme cxr).html
+share/doc/chicken/manual/Module (scheme eval).html
+share/doc/chicken/manual/Module (scheme file).html
+share/doc/chicken/manual/Module (scheme inexact).html
+share/doc/chicken/manual/Module (scheme lazy).html
+share/doc/chicken/manual/Module (scheme load).html
+share/doc/chicken/manual/Module (scheme process-context).html
+share/doc/chicken/manual/Module (scheme r4rs).html
+share/doc/chicken/manual/Module (scheme r5rs).html
+share/doc/chicken/manual/Module (scheme read).html
+share/doc/chicken/manual/Module (scheme repl).html
+share/doc/chicken/manual/Module (scheme time).html
+share/doc/chicken/manual/Module (scheme write).html
share/doc/chicken/manual/Module scheme.html
share/doc/chicken/manual/Module srfi-4.html
share/doc/chicken/manual/Modules.html
