Created attachment 232478 [details] diff outputs for Makefile, distinfo, pkg-plist Diffs includes outputs from: ``` diff -ruN crystal/Makefile crystal-1.3.2/Makefile diff -ruN crystal/distinfo crystal-1.3.2/distinfo diff -ruN crystal/pkg-plist crystal-1.3.2/pkg-plist ```
^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field. Also, shouldn't these two: +etc/bash_completion.d/_crystal.bash +share/zsh/site-functions/_crystal depend on BASH and ZSH options respectively?
(In reply to Fernando Apesteguía from comment #1) Wi
(In reply to slowdive from comment #2) ??
Created attachment 232520 [details] crystal-update-to-1.3.2.patch
(In reply to Fernando Apesteguía from comment #1) Yes, I forgot to revert zsh/bash files, fixed with `crystal-update-to-1.3.2.patch `
Does this build for you? It does not patch for me. It looks like some of the patches in files/ need to be updated.
$ make patch ===> License APACHE20 accepted by the user ===> crystal-1.3.2 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by crystal-1.3.2 for building ===> Extracting for crystal-1.3.2 => SHA256 Checksum OK for crystal/crystal-1.1.1-freebsd12-amd64-llvm10. => SHA256 Checksum OK for crystal/crystal-lang-crystal-1.3.2_GH0.tar.gz. /bin/mkdir -p /data/fernape_data/FreeBSD-repos/ports/lang/crystal/work/crystal-1.3.2/.build cp -f /data/fernape_data/FreeBSD-repos/ports/distfiles/crystal/crystal-1.1.1-freebsd12-amd64-llvm10 /data/fernape_data/FreeBSD-repos/ports/lang/crystal/work/crystal-1.3.2/.build/crystal /bin/chmod +x /data/fernape_data/FreeBSD-repos/ports/lang/crystal/work/crystal-1.3.2/.build/crystal /bin/ln -s x86_64-freebsd /data/fernape_data/FreeBSD-repos/ports/lang/crystal/work/crystal-1.3.2/src/lib_c/aarch64-portbld-freebsd /bin/ln -s x86_64-freebsd /data/fernape_data/FreeBSD-repos/ports/lang/crystal/work/crystal-1.3.2/src/lib_c/aarch64-freebsd ===> Patching for crystal-1.3.2 ===> Applying extra patch /data/fernape_data/FreeBSD-repos/ports/lang/crystal/files/extra-patch-src_openssl_lib__crypto.cr 1 out of 1 hunks failed--saving rejects to src/openssl/lib_crypto.cr.rej ===> FAILED Applying extra patch /data/fernape_data/FreeBSD-repos/ports/lang/crystal/files/extra-patch-src_openssl_lib__crypto.cr *** Error code 1 Stop. make[1]: stopped in /data/fernape_data/FreeBSD-repos/ports/lang/crystal *** Error code 1 Stop. make: stopped in /data/fernape_data/FreeBSD-repos/ports/lang/crystal
(In reply to Fernando Apesteguía from comment #6) I remember that every test from the book passed, and then spec and local tests. But I do not remember running `patch`, about to do this right now.
(In reply to Fernando Apesteguía from comment #7) No issues with `make patch` ``` root@nomad:/usr/ports/lang/crystal # make patch ===> License APACHE20 accepted by the user ===> crystal-1.3.2 depends on file: /usr/local/sbin/pkg - found => crystal-1.1.1-freebsd12-amd64-llvm10 doesn't seem to exist in /usr/ports/distfiles/crystal. => Attempting to fetch https://dl.unrelenting.technology/crystal/crystal-1.1.1-freebsd12-amd64-llvm10 crystal-1.1.1-freebsd12-amd64-llvm10 11 MB 6988 kBps 01s => crystal-lang-crystal-1.3.2_GH0.tar.gz doesn't seem to exist in /usr/ports/distfiles/crystal. => Attempting to fetch https://codeload.github.com/crystal-lang/crystal/tar.gz/1.3.2?dummy=/crystal-lang-crystal-1.3.2_GH0.tar.gz fetch: https://codeload.github.com/crystal-lang/crystal/tar.gz/1.3.2?dummy=/crystal-lang-crystal-1.3.2_GH0.tar.gz: size unknown fetch: https://codeload.github.com/crystal-lang/crystal/tar.gz/1.3.2?dummy=/crystal-lang-crystal-1.3.2_GH0.tar.gz: size of remote file is not known crystal-lang-crystal-1.3.2_GH0.tar.gz 2768 kB 3134 kBps 01s ===> Fetching all distfiles required by crystal-1.3.2 for building ===> Extracting for crystal-1.3.2 => SHA256 Checksum OK for crystal/crystal-1.1.1-freebsd12-amd64-llvm10. => SHA256 Checksum OK for crystal/crystal-lang-crystal-1.3.2_GH0.tar.gz. /bin/mkdir -p /usr/ports/lang/crystal/work/crystal-1.3.2/.build cp -f /usr/ports/distfiles/crystal/crystal-1.1.1-freebsd12-amd64-llvm10 /usr/ports/lang/crystal/work/crystal-1.3.2/.build/crystal /bin/chmod +x /usr/ports/lang/crystal/work/crystal-1.3.2/.build/crystal /bin/ln -s x86_64-freebsd /usr/ports/lang/crystal/work/crystal-1.3.2/src/lib_c/aarch64-portbld-freebsd /bin/ln -s x86_64-freebsd /usr/ports/lang/crystal/work/crystal-1.3.2/src/lib_c/aarch64-freebsd ===> Patching for crystal-1.3.2 root@nomad:/usr/ports/lang/crystal # ``` But extra patch is not in my output either, going to look into this.
(In reply to slowdive from comment #9) Those extra patches are applied conditionally (https://docs.freebsd.org/en/books/porters-handbook/slow-porting/#slow-patch). From the Makefile: # crystal needs pkgconfig to determine SSL variants but these are not # present in FreeBSD base. We splice in the correct info based on # FreeBSD version and hope it doesn't change during minor releases. # See post-patch for the substitutions of these patches. .if ${SSL_DEFAULT} == "base" EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_openssl_lib__crypto.cr \ ${PATCHDIR}/extra-patch-src_openssl_lib__ssl.cr .endif Do you have a different SSL_DEFAULT?
(In reply to Fernando Apesteguía from comment #10) I had `openssl` so it didn't trigger an error. Switched to `base` and seeing the same, working on it: ``` root@nomad:/usr/ports/lang/crystal # make patch ===> License APACHE20 accepted by the user ===> crystal-1.3.2 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by crystal-1.3.2 for building ===> Extracting for crystal-1.3.2 => SHA256 Checksum OK for crystal/crystal-1.1.1-freebsd12-amd64-llvm10. => SHA256 Checksum OK for crystal/crystal-lang-crystal-1.3.2_GH0.tar.gz. /bin/mkdir -p /usr/ports/lang/crystal/work/crystal-1.3.2/.build cp -f /usr/ports/distfiles/crystal/crystal-1.1.1-freebsd12-amd64-llvm10 /usr/ports/lang/crystal/work/crystal-1.3.2/.build/crystal /bin/chmod +x /usr/ports/lang/crystal/work/crystal-1.3.2/.build/crystal /bin/ln -s x86_64-freebsd /usr/ports/lang/crystal/work/crystal-1.3.2/src/lib_c/aarch64-portbld-freebsd /bin/ln -s x86_64-freebsd /usr/ports/lang/crystal/work/crystal-1.3.2/src/lib_c/aarch64-freebsd ===> Patching for crystal-1.3.2 ===> Applying extra patch /usr/ports/lang/crystal/files/extra-patch-src_openssl_lib__crypto.cr 1 out of 1 hunks failed--saving rejects to src/openssl/lib_crypto.cr.rej ===> FAILED Applying extra patch /usr/ports/lang/crystal/files/extra-patch-src_openssl_lib__crypto.cr *** Error code 1 Stop. make[1]: stopped in /usr/ports/lang/crystal *** Error code 1 Stop. make: stopped in /usr/ports/lang/crystal root@nomad:/usr/ports/lang/crystal # ``` And with no defaults no error as well.
Updated patch files, going to rebase to `1.4` and test it out.
Created attachment 233109 [details] extra-patch-src_openssl_lib__crypto-1.4.0.cr
Created attachment 233110 [details] extra-patch-src_openssl_lib__ssl-1.4.0.cr
Now I am getting: ``` In src/openssl/lib_crypto.cr:4:26 4 | OPENSSL_VERSION = {{ ssl_version }} ^---------- Error: undefined macro variable 'ssl_version' ```
Oh I grabbed orig vars
Created attachment 233111 [details] Update-to-1.4.0.patch
Committed, Thanks!
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=8cd785de155f660685d9d64ba9c9dc9ae53066c1 commit 8cd785de155f660685d9d64ba9c9dc9ae53066c1 Author: Fernando Apesteguía <fernape@FreeBSD.org> AuthorDate: 2022-04-11 16:42:14 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2022-04-12 09:41:32 +0000 lang/crystal: Update to 1.4.0 ChangeLog: https://crystal-lang.org/2022/04/06/1.4.0-released.html PR: 262581 Reported by: slowdive@me.com Approved by: greg@unrelenting.technology (maintainer, timeout > 2 weeks) lang/crystal/Makefile | 7 +- lang/crystal/distinfo | 8 +- .../files/extra-patch-src_openssl_lib__crypto.cr | 39 ++++-- .../files/extra-patch-src_openssl_lib__ssl.cr | 28 +++-- lang/crystal/pkg-plist | 135 +++++++++++++++++++-- 5 files changed, 182 insertions(+), 35 deletions(-)
Please readd the aarch64 bootstrap checksum lines that were deleted here. That's these lines: SHA256 (crystal/crystal-1.1.1-freebsd12-aarch64-llvm10) = 51433c9cff796da1423e2a6d77c87891cd7ba4cee37ef25322b2e801aba2b53b SIZE (crystal/crystal-1.1.1-freebsd12-aarch64-llvm10) = 11093864
Created attachment 233348 [details] lang-crystal-Readd-aarch64-llvm10.patch
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=71ec7cdb3d51f1a8c908488e1eae856d4fa45dbb commit 71ec7cdb3d51f1a8c908488e1eae856d4fa45dbb Author: Fernando Apesteguía <fernape@FreeBSD.org> AuthorDate: 2022-04-20 06:43:13 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2022-04-20 14:21:29 +0000 lang/crystal: Readd aarch64 boostrap checksum Removed by mistake in last update PR: 262581 Reported by: greg@unrelenting.technology (maintainer) Fixes: 8cd785de155f660685d9d64ba9c9dc9ae53066c1 lang/crystal/distinfo | 2 ++ 1 file changed, 2 insertions(+)
Done. Thanks!