CVS commit: pkgsrc/lang/squeak-vm

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan  4 11:28:20 UTC 2026

Modified Files:
        pkgsrc/lang/squeak-vm: Makefile distinfo
Added Files:
        pkgsrc/lang/squeak-vm/patches: patch-unix_CMakeLists.txt

Log Message:
squeak-vm: fix some problems building on NetBSD-current.

Now fails in linking step.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/lang/squeak-vm/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/squeak-vm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/squeak-vm/patches/patch-unix_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/squeak-vm/Makefile
diff -u pkgsrc/lang/squeak-vm/Makefile:1.70 pkgsrc/lang/squeak-vm/Makefile:1.71
--- pkgsrc/lang/squeak-vm/Makefile:1.70 Thu Oct 23 20:38:06 2025
+++ pkgsrc/lang/squeak-vm/Makefile      Sun Jan  4 11:28:20 2026
@@ -1,22 +1,18 @@
-# $NetBSD: Makefile,v 1.70 2025/10/23 20:38:06 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.71 2026/01/04 11:28:20 wiz Exp $
 
 SQUEAK_VERSION=        4.10.2.2614
-
 DISTNAME=      Squeak-${SQUEAK_VERSION}-src
 PKGNAME=       squeak-vm-${SQUEAK_VERSION:C/-/./}
 PKGREVISION=   36
 CATEGORIES=    lang
 MASTER_SITES=  https://files.squeak.org/
+DIST_SUBDIR=   squeak
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://squeak.org/
 COMMENT=       Full Smalltalk 80 with portability to UN*X, Mac, and Windows
 LICENSE=       2-clause-bsd
 
-DIST_SUBDIR=           squeak
-CHECK_PORTABILITY_SKIP=        unix/config/configure   # not used anymore
-
 USE_LANGUAGES= c c++
 USE_CMAKE=     yes
 USE_TOOLS+=    gzip pkg-config
@@ -31,6 +27,13 @@ CMAKE_CONFIGURE_ARGS+=       -DCMAKE_POLICY_VE
 
 LDFLAGS.SunOS+=        -lsocket -lnsl -lm
 
+CFLAGS+=       -Wno-int-conversion
+CFLAGS+=       -Wno-implicit-function-declaration
+CFLAGS+=       -Wno-implicit-int
+CFLAGS+=       -Wno-incompatible-pointer-types
+
+CHECK_PORTABILITY_SKIP=        unix/config/configure   # not used anymore
+
 # UUID routines are in libc:
 BUILDLINK_TRANSFORM.NetBSD+=   rm:-luuid
 

Index: pkgsrc/lang/squeak-vm/distinfo
diff -u pkgsrc/lang/squeak-vm/distinfo:1.11 pkgsrc/lang/squeak-vm/distinfo:1.12
--- pkgsrc/lang/squeak-vm/distinfo:1.11 Tue Oct 26 10:51:56 2021
+++ pkgsrc/lang/squeak-vm/distinfo      Sun Jan  4 11:28:20 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:51:56 nia Exp $
+$NetBSD: distinfo,v 1.12 2026/01/04 11:28:20 wiz Exp $
 
 BLAKE2s (squeak/Squeak-4.10.2.2614-src.tar.gz) = c4d82a638208cf5f23ab7d879ab355c8513ae2e0cc0b9d1155dab83fee7fdee4
 SHA512 (squeak/Squeak-4.10.2.2614-src.tar.gz) = b823fb97f7826dbbae5feeb15ffc3ab7e11cf27c5a3cc3f2cf2f8c39b56af5f9d0078d020a4b8f72b997198d296be6d85ec10e0bca10d5214bf586e1e0587f07
@@ -12,5 +12,6 @@ SHA1 (patch-ac) = bad06ae257766407c90a62
 SHA1 (patch-ad) = e426d1de4b496704be08c67d2d2ab61a24735017
 SHA1 (patch-ae) = 73c358e42d153c9e6fe605fa1c77360ad48c6ec3
 SHA1 (patch-af) = 529550d988f5655791942145c79f5448431c04c4
+SHA1 (patch-unix_CMakeLists.txt) = 283b66810e94e8f08d98812d327f7150eb5becdb
 SHA1 (patch-unix_plugins_SerialPlugin_sqUnixSerial.c) = 674a9cf191958ecff2cfd1d6527fcff803f27861
 SHA1 (patch-unix_plugins_UUIDPlugin_sqUnixUUID.c) = 949ca3dff48806d99ea8d54d485fea1b6449a6e9

Added files:

Index: pkgsrc/lang/squeak-vm/patches/patch-unix_CMakeLists.txt
diff -u /dev/null pkgsrc/lang/squeak-vm/patches/patch-unix_CMakeLists.txt:1.1
--- /dev/null   Sun Jan  4 11:28:20 2026
+++ pkgsrc/lang/squeak-vm/patches/patch-unix_CMakeLists.txt     Sun Jan  4 11:28:20 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-unix_CMakeLists.txt,v 1.1 2026/01/04 11:28:20 wiz Exp $
+
+No CMake files in npsqueak directory, so recursing there doesn't work.
+
+--- unix/CMakeLists.txt.orig   2026-01-04 11:19:19.082755404 +0000
++++ unix/CMakeLists.txt
+@@ -155,7 +155,7 @@ INCLUDE (${unix}/vm/build.cmake)
+ 
+ BUILD_PLUGINS ()
+ 
+-ADD_SUBDIRECTORY (${unix}/npsqueak)
++#ADD_SUBDIRECTORY (${unix}/npsqueak)
+ 
+ SET (cmake ${unix}/../../cmake)
+