pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Add libslirp491 and zimh
Module Name: pkgsrc-wip
Committed By: Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By: rhialto
Date: Sat May 2 13:41:57 2026 +0200
Changeset: 15c3e6134fd8a2858e6aaf0ac589626bb7380c74
Added Files:
libslirp491/DESCR
libslirp491/Makefile
libslirp491/PLIST
libslirp491/TODO
libslirp491/buildlink3.mk
libslirp491/distinfo
zimh/DESCR
zimh/Makefile
zimh/PLIST
zimh/TODO
zimh/distinfo
zimh/patches/patch-simulators_BESM6_CMakeLists.txt
Log Message:
Add libslirp491 and zimh
libslirp491 is for now needed for zimh, but I didn't want to update
libslirp in main pkgsrc yet before having time to check if its users
work with it.
zimh is a hard fork of open-simh with a different development strategy.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=15c3e6134fd8a2858e6aaf0ac589626bb7380c74
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libslirp491/DESCR | 2 +
libslirp491/Makefile | 24 +++
libslirp491/PLIST | 7 +
libslirp491/TODO | 11 ++
libslirp491/buildlink3.mk | 15 ++
libslirp491/distinfo | 5 +
zimh/DESCR | 21 +++
zimh/Makefile | 36 +++++
zimh/PLIST | 172 +++++++++++++++++++++
zimh/TODO | 9 ++
zimh/distinfo | 6 +
zimh/patches/patch-simulators_BESM6_CMakeLists.txt | 12 ++
12 files changed, 320 insertions(+)
diffs:
diff --git a/libslirp491/DESCR b/libslirp491/DESCR
new file mode 100644
index 0000000000..8dc33d5882
--- /dev/null
+++ b/libslirp491/DESCR
@@ -0,0 +1,2 @@
+libslirp is a user-mode networking library used by virtual machines, containers
+or various tools.
diff --git a/libslirp491/Makefile b/libslirp491/Makefile
new file mode 100644
index 0000000000..408dec5c72
--- /dev/null
+++ b/libslirp491/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.8 2025/10/23 20:38:50 wiz Exp $
+
+DISTNAME= libslirp-4.9.1
+CATEGORIES= net
+MASTER_SITES= https://gitlab.freedesktop.org/-/project/2767/uploads/ed8eaeada090f91a640c8e8e01d704bc/
+EXTRACT_SUFX= .tar.xz
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://gitlab.freedesktop.org/slirp/libslirp
+COMMENT= User-mode networking library
+LICENSE= modified-bsd
+
+USE_TOOLS+= pkg-config
+
+PYTHON_FOR_BUILD_ONLY= tool
+
+PKGCONFIG_OVERRIDE_STAGE= pre-install
+PKGCONFIG_OVERRIDE+= output/meson-private/slirp.pc
+
+LDFLAGS.SunOS+= -lsocket
+
+.include "../../devel/meson/build.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/libslirp491/PLIST b/libslirp491/PLIST
new file mode 100644
index 0000000000..9547949d2e
--- /dev/null
+++ b/libslirp491/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.3 2022/04/27 09:42:52 nia Exp $
+include/slirp/libslirp-version.h
+include/slirp/libslirp.h
+lib/libslirp.so
+lib/libslirp.so.0
+lib/libslirp.so.0.4.0
+lib/pkgconfig/slirp.pc
diff --git a/libslirp491/TODO b/libslirp491/TODO
new file mode 100644
index 0000000000..a4fc643292
--- /dev/null
+++ b/libslirp491/TODO
@@ -0,0 +1,11 @@
+TODO:
+
+check if BUILDLINK_API_DEPENDS.libslirp in buildlink3.mk needs updating
+check if users of the library work with the updated version:
+
+ ./emulators/dosbox-staging/options.mk:. include "../../net/libslirp/buildlink3.mk"
+ ./emulators/dosbox-x/Makefile:.include "../../net/libslirp/buildlink3.mk"
+ ./emulators/nono/Makefile:.include "../../net/libslirp/buildlink3.mk"
+ ./emulators/qemu/Makefile:.include "../../net/libslirp/buildlink3.mk"
+ ./emulators/qemu7/Makefile:.include "../../net/libslirp/buildlink3.mk"
+
diff --git a/libslirp491/buildlink3.mk b/libslirp491/buildlink3.mk
new file mode 100644
index 0000000000..5e74e530d6
--- /dev/null
+++ b/libslirp491/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.5 2025/10/23 20:38:50 wiz Exp $
+
+BUILDLINK_TREE+= libslirp
+
+.if !defined(LIBSLIRP_BUILDLINK3_MK)
+LIBSLIRP_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libslirp+= libslirp>=4.3.1 # needs update?
+BUILDLINK_ABI_DEPENDS.libslirp?= libslirp>=4.9.1
+BUILDLINK_PKGSRCDIR.libslirp?= ../../wip/libslirp491
+
+.include "../../devel/glib2/buildlink3.mk"
+.endif # LIBSLIRP_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -libslirp
diff --git a/libslirp491/distinfo b/libslirp491/distinfo
new file mode 100644
index 0000000000..83b312ce76
--- /dev/null
+++ b/libslirp491/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.7 2022/11/06 17:21:41 triaxx Exp $
+
+BLAKE2s (libslirp-4.9.1.tar.xz) = 7e5fd6ef9f54b6b7f47bf46fc39de456d6de00219334aab1fe08f7ee8e270818
+SHA512 (libslirp-4.9.1.tar.xz) = a251b0a03b1503e81a18409b869ec4b1025328fa369e9170122a4c00d4c71ec9937f45223731399cc12130dc541cb769d0a49ebb7069f1f75586ad5b0a76f197
+Size (libslirp-4.9.1.tar.xz) = 132200 bytes
diff --git a/zimh/DESCR b/zimh/DESCR
new file mode 100644
index 0000000000..1dba946df9
--- /dev/null
+++ b/zimh/DESCR
@@ -0,0 +1,21 @@
+ZIMH Historical Computer Simulator
+
+ZIMH (which stands for "ZIMH Implements Machine History"), is a
+software emulator for important computer systems and peripherals from
+the history of computing. It provides a mechanism by which modern
+users can run and experience what it was like to use old computers
+that have not been made in many decades, or use software that was
+intended for systems that no longer exist.
+
+(It is of course possible to also use the ZIMH framework to simulate
+more recent or even current machines, though this has not been the
+typical use case.)
+
+ZIMH is a hard fork of SIMH, a simulator created by Bob Supnik and
+extended over many years by the SIMH team. We are grateful to Bob and
+the SIMH contributors for all of their work over the years. Without
+their efforts, none of this would be possible.
+
+The development track of ZIMH is substantially different from that of
+the original SIMH project. In particular, this project is pursuing:
+...
diff --git a/zimh/Makefile b/zimh/Makefile
new file mode 100644
index 0000000000..cd415e9fa3
--- /dev/null
+++ b/zimh/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD$
+
+DISTNAME= zimh-0.0.0
+PKGNAME= zimh-0.0.0.2026.05.02
+CATEGORIES= emulators
+MASTER_SITES= ${MASTER_SITE_GITHUB:=pmetzger/}
+GITHUB_PROJECT= zimh
+GITHUB_TAG= 67e1b9ab7d39d18ffd4ae7290bf0b3f0ed3ff2b0
+DIST_SUBDIR= ${GITHUB_PROJECT}
+
+MAINTAINER= rhialto%NetBSD.org@localhost
+HOMEPAGE= https://github.com/pmetzger/zimh/
+COMMENT= Hard fork of open-simh, with different development cycle
+LICENSE= mit
+
+USE_TOOLS+= bison git pkg-config
+
+CMAKE_ARGS+= -DFONTDIR=/usr/pkg/share/fonts/X11/TTF:/usr/X11/share/fonts/X11/TTF
+
+TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
+TOOL_DEPENDS+= cmocka>=1.1.8:../../devel/cmocka
+DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
+
+.include "../../devel/cmake/build.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../fonts/SDL2_ttf/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../devel/editline/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../net/libpcap/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
new file mode 100644
index 0000000000..66c2a98e5d
--- /dev/null
+++ b/zimh/PLIST
@@ -0,0 +1,172 @@
+@comment $NetBSD$
+bin/zimh-3b2-400
+bin/zimh-3b2-700
+bin/zimh-alpha
+bin/zimh-altair
+bin/zimh-altairz80
+bin/zimh-b5500
+bin/zimh-besm6
+bin/zimh-cdc1700
+bin/zimh-eclipse
+bin/zimh-gri
+bin/zimh-h316
+bin/zimh-hp2100
+bin/zimh-hp3000
+bin/zimh-i1401
+bin/zimh-i1620
+bin/zimh-i650
+bin/zimh-i701
+bin/zimh-i7010
+bin/zimh-i704
+bin/zimh-i7070
+bin/zimh-i7080
+bin/zimh-i7090
+bin/zimh-i7094
+bin/zimh-ibm1130
+bin/zimh-id16
+bin/zimh-id32
+bin/zimh-imlac
+bin/zimh-infoserver100
+bin/zimh-infoserver1000
+bin/zimh-infoserver150vxt
+bin/zimh-intel-mds
+bin/zimh-lgp
+bin/zimh-linc
+bin/zimh-microvax1
+bin/zimh-microvax2
+bin/zimh-microvax2000
+bin/zimh-microvax3100
+bin/zimh-microvax3100e
+bin/zimh-microvax3100m80
+bin/zimh-microvax3900
+bin/zimh-nd100
+bin/zimh-nova
+bin/zimh-pdp1
+bin/zimh-pdp10
+bin/zimh-pdp10-ka
+bin/zimh-pdp10-ki
+bin/zimh-pdp10-kl
+bin/zimh-pdp10-ks
+bin/zimh-pdp11
+bin/zimh-pdp15
+bin/zimh-pdp4
+bin/zimh-pdp6
+bin/zimh-pdp7
+bin/zimh-pdp8
+bin/zimh-pdp9
+bin/zimh-pdq3
+bin/zimh-rtvax1000
+bin/zimh-s3
+bin/zimh-sage
+bin/zimh-scelbi
+bin/zimh-sds
+bin/zimh-sel32
+bin/zimh-sigma
+bin/zimh-ssem
+bin/zimh-swtp6800mp-a
+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
+bin/zimh-vax8200
+bin/zimh-vax8600
+bin/zimh-vaxstation3100m30
+bin/zimh-vaxstation3100m38
+bin/zimh-vaxstation3100m76
+bin/zimh-vaxstation4000m60
+bin/zimh-vaxstation4000vlc
+share/doc/zimh/articles/simulators_acm_queue_2004.md
+share/doc/zimh/developers/adding_io_devices.md
+share/doc/zimh/developers/breakpoints.md
+share/doc/zimh/developers/writing_a_simulator.md
+share/doc/zimh/history/0readmeAsynchIO.txt
+share/doc/zimh/history/0readme_39.txt
+share/doc/zimh/history/0readme_ethernet.txt
+share/doc/zimh/history/SIMH-V4-status.md
+share/doc/zimh/maintainers/versioning.md
+share/doc/zimh/manual/faq.md
+share/doc/zimh/manual/magtape_format.md
+share/doc/zimh/manual/networking.md
+share/doc/zimh/manual/sample_software.md
+share/doc/zimh/manual/simulators.md
+share/doc/zimh/manual/users_guide.md
+share/doc/zimh/project/documentation-style.md
+share/doc/zimh/project/layout.md
+share/doc/zimh/simulators/3B2/3b2.md
+share/doc/zimh/simulators/ALTAIR/altair.md
+share/doc/zimh/simulators/AltairZ80/altairz80.md
+share/doc/zimh/simulators/B5500/b5500.md
+share/doc/zimh/simulators/BESM6/besm6.md
+share/doc/zimh/simulators/CDC1700/cdc1700.md
+share/doc/zimh/simulators/GRI/gri.md
+share/doc/zimh/simulators/H316/h316.md
+share/doc/zimh/simulators/H316/h316_imp.md
+share/doc/zimh/simulators/H316/h316_imp_IO_Device_Codes.md
+share/doc/zimh/simulators/H316/h316_imp_IO_Device_Codes_assets/image1.png
+share/doc/zimh/simulators/H316/h316_imp_IO_Device_Codes_assets/image2.png
+share/doc/zimh/simulators/H316/h316_imp_IO_Device_Codes_assets/image3.png
+share/doc/zimh/simulators/H316/h316_imp_IO_Device_Codes_assets/image4.png
+share/doc/zimh/simulators/H316/h316_imp_IO_Device_Codes_assets/image6.png
+share/doc/zimh/simulators/H316/h316_imp_IO_Device_Codes_assets/image7.png
+share/doc/zimh/simulators/H316/h316_imp_IO_Device_Codes_assets/image8.png
+share/doc/zimh/simulators/H316/h316_imp_IO_Device_Codes_assets/image9.png
+share/doc/zimh/simulators/HP2100/hp2100.md
+share/doc/zimh/simulators/HP3000/hp3000.md
+share/doc/zimh/simulators/I1401/i1401.md
+share/doc/zimh/simulators/I1620/i1620.md
+share/doc/zimh/simulators/I1620/i1620_doc_assets/image1.png
+share/doc/zimh/simulators/I1620/i1620_doc_assets/image2.png
+share/doc/zimh/simulators/I1620/i1620_doc_assets/image3.png
+share/doc/zimh/simulators/I650/i650.md
+share/doc/zimh/simulators/I650/i650_doc_assets/image1.png
+share/doc/zimh/simulators/I650/i650_doc_assets/image3.png
+share/doc/zimh/simulators/I7000/i701.md
+share/doc/zimh/simulators/I7000/i7010.md
+share/doc/zimh/simulators/I7000/i7070.md
+share/doc/zimh/simulators/I7000/i7080.md
+share/doc/zimh/simulators/I7094/i7090.md
+share/doc/zimh/simulators/I7094/i7094.md
+share/doc/zimh/simulators/Ibm1130/ibm1130.md
+share/doc/zimh/simulators/Ibm1130/ibm1130_assets/image1.jpeg
+share/doc/zimh/simulators/Ibm1130/ibm1130_assets/image2.jpeg
+share/doc/zimh/simulators/Ibm1130/ibm1130_assets/image3.jpeg
+share/doc/zimh/simulators/Ibm1130/ibm1130_assets/image4.jpeg
+share/doc/zimh/simulators/Ibm1130/ibm1130_assets/image5.png
+share/doc/zimh/simulators/Ibm1130/ibm1130_assets/image6.png
+share/doc/zimh/simulators/Intel-Systems/intel-mds.md
+share/doc/zimh/simulators/Intel-Systems/scelbi.md
+share/doc/zimh/simulators/Interdata/id.md
+share/doc/zimh/simulators/LGP/lgp.md
+share/doc/zimh/simulators/ND100/nd100.md
+share/doc/zimh/simulators/NOVA/nova.md
+share/doc/zimh/simulators/PDP1/pdp1.md
+share/doc/zimh/simulators/PDP10/ka10.md
+share/doc/zimh/simulators/PDP10/ki10.md
+share/doc/zimh/simulators/PDP10/kl10.md
+share/doc/zimh/simulators/PDP10/ks10.md
+share/doc/zimh/simulators/PDP10/pdp10.md
+share/doc/zimh/simulators/PDP10/pdp6.md
+share/doc/zimh/simulators/PDP11/pdp11.md
+share/doc/zimh/simulators/PDP18B/pdp18b.md
+share/doc/zimh/simulators/PDP8/pdp8.md
+share/doc/zimh/simulators/PDQ-3/pdq3.md
+share/doc/zimh/simulators/S3/s3.md
+share/doc/zimh/simulators/SAGE/sage.md
+share/doc/zimh/simulators/SDS/sds.md
+share/doc/zimh/simulators/SEL32/sel32.md
+share/doc/zimh/simulators/SSEM/ssem.md
+share/doc/zimh/simulators/TX-0/tx0.md
+share/doc/zimh/simulators/VAX/vax.md
+share/doc/zimh/simulators/VAX/vax780.md
+share/doc/zimh/simulators/alpha/alpha.md
+share/doc/zimh/simulators/imlac/imlac.md
+share/doc/zimh/simulators/linc/linc.md
+share/doc/zimh/simulators/sigma/sigma.md
+share/doc/zimh/simulators/swtp6800/swtp6800.md
+share/doc/zimh/simulators/swtp6800/swtp6800_doc_assets/image1.png
+share/doc/zimh/simulators/swtp6800/swtp6800_doc_assets/image2.png
+share/doc/zimh/simulators/tt2500/tt2500.md
diff --git a/zimh/TODO b/zimh/TODO
new file mode 100644
index 0000000000..0f4e1817d9
--- /dev/null
+++ b/zimh/TODO
@@ -0,0 +1,9 @@
+At least:
+
+-- Checking for module 'cmocka'
+-- Package 'cmocka' not found
+-- Host-side unit tests requested but cmocka was not found
+
+even though the Makefile has "TOOL_DEPENDS+= cmocka>=1.1.8:../../devel/cmocka"
+
+Do we need ".include "../../mk/dlopen.buildlink3.mk"" ?
diff --git a/zimh/distinfo b/zimh/distinfo
new file mode 100644
index 0000000000..0f3bf24379
--- /dev/null
+++ b/zimh/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+BLAKE2s (zimh/zimh-0.0.0-67e1b9ab7d39d18ffd4ae7290bf0b3f0ed3ff2b0.tar.gz) = a8c80041508d2fc2032cfa40a6f87a690ca19692b07ddcf73d113ef162115341
+SHA512 (zimh/zimh-0.0.0-67e1b9ab7d39d18ffd4ae7290bf0b3f0ed3ff2b0.tar.gz) = 5d45282d632b4ca63943a3b99d155834b432e85c88f2cbe93a616b4b05cba8e46a14fe1bff078c20f0d1a60f956a578522ae0cb0fc28b6e8c805a2924dd5f8a1
+Size (zimh/zimh-0.0.0-67e1b9ab7d39d18ffd4ae7290bf0b3f0ed3ff2b0.tar.gz) = 32394224 bytes
+SHA1 (patch-simulators_BESM6_CMakeLists.txt) = 39c9af6ce2f4ee95a8b393d9f67fae5dc0a60768
diff --git a/zimh/patches/patch-simulators_BESM6_CMakeLists.txt b/zimh/patches/patch-simulators_BESM6_CMakeLists.txt
new file mode 100644
index 0000000000..b447cd7526
--- /dev/null
+++ b/zimh/patches/patch-simulators_BESM6_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- simulators/BESM6/CMakeLists.txt.orig 2026-05-02 11:32:28.514415734 +0000
++++ simulators/BESM6/CMakeLists.txt
+@@ -15,6 +15,7 @@ set(cand_fonts
+ "tahoma.ttf")
+ set(cand_fontdirs
+ "/usr/share/fonts"
++ "/usr/pkg/share/fonts/X11/TTF"
+ "/usr/lib/jvm"
+ "/Library/Fonts"
+ "/System/Library/Fonts"
Home |
Main Index |
Thread Index |
Old Index