pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Update zimh; cmocka201 no longer needed
Module Name: pkgsrc-wip
Committed By: Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By: rhialto
Date: Sat Aug 8 16:21:56 2026 +0200
Changeset: d14a12b500169ee4ac75a9dd72b0923f8531d69c
Modified Files:
zimh/Makefile
zimh/PLIST
zimh/TODO
zimh/distinfo
Removed Files:
cmocka201/DESCR
cmocka201/Makefile
cmocka201/PLIST
cmocka201/PLIST.new
cmocka201/buildlink3.mk
cmocka201/distinfo
cmocka201/patches/patch-CompilerChecks.cmake
Log Message:
Update zimh; cmocka201 no longer needed
since it is in pkgsrc proper.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d14a12b500169ee4ac75a9dd72b0923f8531d69c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cmocka201/DESCR | 4 ----
cmocka201/Makefile | 18 ----------------
cmocka201/PLIST | 12 -----------
cmocka201/PLIST.new | 12 -----------
cmocka201/buildlink3.mk | 13 -----------
cmocka201/distinfo | 6 ------
cmocka201/patches/patch-CompilerChecks.cmake | 32 ----------------------------
zimh/Makefile | 14 ++++++------
zimh/PLIST | 1 -
zimh/TODO | 2 --
zimh/distinfo | 6 +++---
11 files changed, 9 insertions(+), 111 deletions(-)
diffs:
diff --git a/cmocka201/DESCR b/cmocka201/DESCR
deleted file mode 100644
index 6a138e7859..0000000000
--- a/cmocka201/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-cmocka is an elegant unit testing framework for C with support for
-mock objects. It only requires the standard C library, works on a
-range of computing platforms (including embedded) and with different
-compilers.
diff --git a/cmocka201/Makefile b/cmocka201/Makefile
deleted file mode 100644
index 6cc258d521..0000000000
--- a/cmocka201/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD$
-
-DISTNAME= cmocka-2.0.1
-CATEGORIES= devel
-MASTER_SITES= https://cmocka.org/files/${PKGVERSION_NOREV:R}/
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://cmocka.org/
-COMMENT= Unit testing framework for C supporting mock objects
-LICENSE= apache-2.0
-
-# GCC 4.3/4.4 provides wrong warnings:
-# cmocka.c:3281: error: 'setup_name' may be used uninitialized in this function
-CMAKE_CONFIGURE_ARGS+= -DWITH_WERROR_UNINITIALIZED_FLAG=0
-
-.include "../../devel/cmake/build.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/cmocka201/PLIST b/cmocka201/PLIST
deleted file mode 100644
index 689c7381b5..0000000000
--- a/cmocka201/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD$
-include/cmocka.h
-include/cmocka_pbc.h
-include/cmocka_version.h
-lib/cmake/cmocka/cmocka-config-version.cmake
-lib/cmake/cmocka/cmocka-config.cmake
-lib/cmake/cmocka/cmocka-targets-noconfig.cmake
-lib/cmake/cmocka/cmocka-targets.cmake
-lib/libcmocka.so
-lib/libcmocka.so.0
-lib/libcmocka.so.1.0.1
-lib/pkgconfig/cmocka.pc
diff --git a/cmocka201/PLIST.new b/cmocka201/PLIST.new
deleted file mode 100644
index 689c7381b5..0000000000
--- a/cmocka201/PLIST.new
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD$
-include/cmocka.h
-include/cmocka_pbc.h
-include/cmocka_version.h
-lib/cmake/cmocka/cmocka-config-version.cmake
-lib/cmake/cmocka/cmocka-config.cmake
-lib/cmake/cmocka/cmocka-targets-noconfig.cmake
-lib/cmake/cmocka/cmocka-targets.cmake
-lib/libcmocka.so
-lib/libcmocka.so.0
-lib/libcmocka.so.1.0.1
-lib/pkgconfig/cmocka.pc
diff --git a/cmocka201/buildlink3.mk b/cmocka201/buildlink3.mk
deleted file mode 100644
index 584ee41ad8..0000000000
--- a/cmocka201/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2019/11/23 08:45:45 mef Exp $
-
-BUILDLINK_TREE+= cmocka
-
-.if !defined(CMOCKA_BUILDLINK3_MK)
-CMOCKA_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.cmocka+= cmocka>=1.1.3
-BUILDLINK_ABI_DEPENDS.cmocka?= cmocka>=1.1.5
-BUILDLINK_PKGSRCDIR.cmocka?= ../../devel/cmocka
-.endif # CMOCKA_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -cmocka
diff --git a/cmocka201/distinfo b/cmocka201/distinfo
deleted file mode 100644
index 41894ca790..0000000000
--- a/cmocka201/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.13 2025/07/23 08:09:09 pin Exp $
-
-BLAKE2s (cmocka-2.0.1.tar.xz) = 15b959f70aa18050d69e97e8455c212b0312b7f9ddf34a412a132cd9567408d3
-SHA512 (cmocka-2.0.1.tar.xz) = 752ddb757d73186bcba1c1179917a2a2ef62992caa2aa3639cc1c88258c94ab3de5100a874d99501d446aeb24d6dd4a0d12466b4a97ee01730b8b13700c3b5a4
-Size (cmocka-2.0.1.tar.xz) = 121112 bytes
-SHA1 (patch-CompilerChecks.cmake) = fb95ed5a88c4bb5b2bb82b0a4005217ef9de8d28
diff --git a/cmocka201/patches/patch-CompilerChecks.cmake b/cmocka201/patches/patch-CompilerChecks.cmake
deleted file mode 100644
index ae4328e543..0000000000
--- a/cmocka201/patches/patch-CompilerChecks.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-CompilerChecks.cmake,v 1.3 2025/07/23 08:09:09 pin Exp $
-
-Let PkgSrc handle security features.
-
---- CompilerChecks.cmake.orig 2026-05-02 12:33:09.586028113 +0000
-+++ CompilerChecks.cmake
-@@ -73,25 +73,6 @@ if (UNIX)
- endif()
- endif()
-
-- check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR_STRONG)
-- if (WITH_STACK_PROTECTOR_STRONG)
-- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong")
-- # This is needed as Solaris and others have a seperate libssp
-- list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong")
-- else (WITH_STACK_PROTECTOR_STRONG)
-- check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
-- if (WITH_STACK_PROTECTOR)
-- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector")
-- # This is needed as Solaris and others have a seperate libssp
-- list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector")
-- endif()
-- endif (WITH_STACK_PROTECTOR_STRONG)
--
-- check_c_compiler_flag_ssp("-fstack-clash-protection" WITH_STACK_CLASH_PROTECTION)
-- if (WITH_STACK_CLASH_PROTECTION)
-- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-clash-protection")
-- endif()
--
- if (PICKY_DEVELOPER)
- add_c_compiler_flag("-Wno-error=deprecated-declarations" SUPPORTED_COMPILER_FLAGS)
- add_c_compiler_flag("-Wno-error=tautological-compare" SUPPORTED_COMPILER_FLAGS)
diff --git a/zimh/Makefile b/zimh/Makefile
index e89a97aa1f..7ea3ced27d 100644
--- a/zimh/Makefile
+++ b/zimh/Makefile
@@ -4,11 +4,11 @@
# no releases yet. Typically, to get the latest version, you just need to update
# the GITHUB_TAG and put the correct date in PKGNAME's version part.
DISTNAME= zimh-0.0.0
-PKGNAME= zimh-0.0.0.2026.05.25.00 # date + seqnr per day
+PKGNAME= zimh-0.0.0.2026.07.27.00 # date + seqnr per day
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=pmetzger/}
GITHUB_PROJECT= zimh
-GITHUB_TAG= 32cf6c24209f7b4607252f9a5f84a5e0401ee84b
+GITHUB_TAG= 4b8ebeff66ae9326aff44e98fba465f5d1bd7456
DIST_SUBDIR= ${GITHUB_PROJECT}
MAINTAINER= rhialto%NetBSD.org@localhost
@@ -19,16 +19,14 @@ LICENSE= mit
USE_TOOLS+= bison git pkg-config
TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
-#TOOL_DEPENDS+= cmocka>=1.1.8:../../devel/cmocka
-TOOL_DEPENDS+= cmocka>=2.0.1:../../wip/cmocka201
+TOOL_DEPENDS+= cmocka>=2.0.2:../../devel/cmocka
DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
CMAKE_CONFIGURE_ARGS+= -DWITH_UNIT_TESTS=ON
#CMAKE_CONFIGURE_ARGS+= -DWITH_UNIT_TESTS=OFF
.include "../../devel/cmake/build.mk"
-#.include "../../devel/cmocka/buildlink3.mk" # enabling this makes cmake find cmocka
-.include "../../wip/cmocka201/buildlink3.mk" # enabling this makes cmake find cmocka
+.include "../../devel/cmocka/buildlink3.mk"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../fonts/SDL2_ttf/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
@@ -37,8 +35,8 @@ CMAKE_CONFIGURE_ARGS+= -DWITH_UNIT_TESTS=ON
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../net/libpcap/buildlink3.mk"
-.include "../../net/libslirp/buildlink3.mk"
-#.include "../../wip/libslirp491/buildlink3.mk"
+#.include "../../net/libslirp/buildlink3.mk"
+.include "../../wip/libslirp491/buildlink3.mk"
#.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/zimh/PLIST b/zimh/PLIST
index 83f829ce5f..c96a9fa3aa 100644
--- a/zimh/PLIST
+++ b/zimh/PLIST
@@ -68,7 +68,6 @@ bin/zimh-swtp6800mp-a2
bin/zimh-tt2500
bin/zimh-tx-0
bin/zimh-uc15
-bin/zimh-vax
bin/zimh-vax730
bin/zimh-vax750
bin/zimh-vax780
diff --git a/zimh/TODO b/zimh/TODO
index ac596623ca..a6f243635c 100644
--- a/zimh/TODO
+++ b/zimh/TODO
@@ -4,5 +4,3 @@ Do we need ".include "../../mk/dlopen.buildlink3.mk"" ?
Get ../libslirp491 into main pkgsrc, since installing it conflicts with e.g.
qemu.
-
-Get ../cmocka201 into main pkgsrc.
diff --git a/zimh/distinfo b/zimh/distinfo
index bfe459f746..66ee6f3c2d 100644
--- a/zimh/distinfo
+++ b/zimh/distinfo
@@ -1,6 +1,6 @@
$NetBSD$
-BLAKE2s (zimh/zimh-0.0.0-ce0bfeac101ca289ff97e91aa8bbf36d99ef837c.tar.gz) = 30ce0540c59830736565b61b47b9c972bc5a5fa1765a2da56945ff831ebc100e
-SHA512 (zimh/zimh-0.0.0-ce0bfeac101ca289ff97e91aa8bbf36d99ef837c.tar.gz) = b4a47b6b064fdc145d43189e0f617b85966e8d22cad4aed1286d468f246f2ce1fa56b0b6a63dff828e27eaf875b42f4d5e29db7a7914e1c0c55a367c7dd5fcd2
-Size (zimh/zimh-0.0.0-ce0bfeac101ca289ff97e91aa8bbf36d99ef837c.tar.gz) = 32637885 bytes
+BLAKE2s (zimh/zimh-0.0.0-4b8ebeff66ae9326aff44e98fba465f5d1bd7456.tar.gz) = d33e0eefbbb4a77cff78377f123fb740b232963aea620d2823a105038149e66a
+SHA512 (zimh/zimh-0.0.0-4b8ebeff66ae9326aff44e98fba465f5d1bd7456.tar.gz) = f4492c467b844707305282f7d8f06b1365e5d784c1d1846353cb2396643667c5d1d18a65b0b1cfb7b6ec200632974af92bc2504899e48c8e0819470ff68edf6f
+Size (zimh/zimh-0.0.0-4b8ebeff66ae9326aff44e98fba465f5d1bd7456.tar.gz) = 32611764 bytes
SHA1 (patch-simulators_BESM6_CMakeLists.txt) = 39c9af6ce2f4ee95a8b393d9f67fae5dc0a60768
Home |
Main Index |
Thread Index |
Old Index