Puppet removal

Index: databases/openvoxdb/8/Makefile
===================================================================
RCS file: /cvs/ports/databases/openvoxdb/8/Makefile,v
diff -u -r1.1.1.1 Makefile
--- databases/openvoxdb/8/Makefile 1 Feb 2026 21:18:29 -0000 1.1.1.1
+++ databases/openvoxdb/8/Makefile 19 Feb 2026 10:13:45 -0000
@@ -1,6 +1,7 @@
COMMENT-main = fast, scalable, and reliable data warehouse for OpenVox
COMMENT-plugin =OpenVoxDB terminus plugin

+REVISION = 0
VERSION = 8.12.1
DISTNAME = openvoxdb-${VERSION}
PKGNAME-plugin =openvoxdb-termini-${VERSION}
Index: databases/openvoxdb/8/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/openvoxdb/8/pkg/PLIST-main,v
diff -u -r1.1.1.1 PLIST-main
--- databases/openvoxdb/8/pkg/PLIST-main 1 Feb 2026 21:18:29 -0000 1.1.1.1
+++ databases/openvoxdb/8/pkg/PLIST-main 19 Feb 2026 10:13:45 -0000
@@ -1,5 +1,6 @@
@option is-branch
@conflict puppetdb-*
+@pkgpath databases/puppetdb/8
@newgroup _puppetdb:719
@newuser _puppetdb:719:719::PuppetDB user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/puppetdb
Index: databases/openvoxdb/8/pkg/PLIST-plugin
===================================================================
RCS file: /cvs/ports/databases/openvoxdb/8/pkg/PLIST-plugin,v
diff -u -r1.1.1.1 PLIST-plugin
--- databases/openvoxdb/8/pkg/PLIST-plugin 1 Feb 2026 21:18:29 -0000 1.1.1.1
+++ databases/openvoxdb/8/pkg/PLIST-plugin 19 Feb 2026 10:13:45 -0000
@@ -1,5 +1,6 @@
@option is-branch
@conflict puppetdb-termini-*
+@pkgpath databases/puppetdb/8
share/puppetlabs/puppet/
share/puppetlabs/puppet/puppet/
share/puppetlabs/puppet/puppet/face/
Index: sysutils/openvox-server/8/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/openvox-server/8/Makefile,v
diff -u -r1.2 Makefile
--- sysutils/openvox-server/8/Makefile 10 Feb 2026 08:11:17 -0000 1.2
+++ sysutils/openvox-server/8/Makefile 19 Feb 2026 10:13:45 -0000
@@ -1,6 +1,6 @@
COMMENT = OpenVox server

-REVISION = 0
+REVISION = 1
VERSION = 8.12.1
DISTNAME = openvox-server-${VERSION}

Index: sysutils/openvox-server/8/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/openvox-server/8/pkg/PLIST,v
diff -u -r1.1.1.1 PLIST
--- sysutils/openvox-server/8/pkg/PLIST 1 Feb 2026 21:32:45 -0000 1.1.1.1
+++ sysutils/openvox-server/8/pkg/PLIST 19 Feb 2026 10:13:45 -0000
@@ -1,5 +1,6 @@
@option is-branch
@conflict puppetserver-*
+@pkgpath sysutils/puppetserver/8
@rcscript ${RCDIR}/puppetserver
bin/puppetserver
share/doc/pkg-readmes/${PKGSTEM}
Index: sysutils/ruby-openvox/8/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-openvox/8/Makefile,v
diff -u -r1.8 Makefile
--- sysutils/ruby-openvox/8/Makefile 9 Feb 2026 13:24:31 -0000 1.8
+++ sysutils/ruby-openvox/8/Makefile 19 Feb 2026 10:13:45 -0000
@@ -1,5 +1,5 @@
VERSION = 8.24.2
-REVISION = 1
+REVISION = 2

RUN_DEPENDS = converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.13,<2 \
devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR}>=1,<2 \
Index: sysutils/ruby-openvox/8/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/ruby-openvox/8/pkg/PLIST,v
diff -u -r1.4 PLIST
--- sysutils/ruby-openvox/8/pkg/PLIST 12 Dec 2025 20:37:51 -0000 1.4
+++ sysutils/ruby-openvox/8/pkg/PLIST 19 Feb 2026 10:13:45 -0000
@@ -1,5 +1,6 @@
@option is-branch
@conflict puppet-*
+@pkgpath sysutils/ruby-puppet/8,ruby34
@newgroup _puppet:580
@newuser _puppet:580:580::Puppet user:/var/empty:/sbin/nologin
@extraunexec rm -rf ${SYSCONFDIR}/puppetlabs/puppet/*
Index: sysutils/ruby-openvoxserver-ca/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-openvoxserver-ca/Makefile,v
diff -u -r1.1.1.1 Makefile
--- sysutils/ruby-openvoxserver-ca/Makefile 1 Feb 2026 21:11:26 -0000 1.1.1.1
+++ sysutils/ruby-openvoxserver-ca/Makefile 19 Feb 2026 10:13:45 -0000
@@ -1,5 +1,6 @@
COMMENT = interact with OpenVox Server's CA

+REVISION = 0
DISTNAME = openvoxserver-ca-3.0.0
CATEGORIES = sysutils
HOMEPAGE = https://github.com/OpenVoxProject/openvoxserver-ca/
Index: sysutils/ruby-openvoxserver-ca/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/ruby-openvoxserver-ca/pkg/PLIST,v
diff -u -r1.1.1.1 PLIST
--- sysutils/ruby-openvoxserver-ca/pkg/PLIST 1 Feb 2026 21:11:26 -0000 1.1.1.1
+++ sysutils/ruby-openvoxserver-ca/pkg/PLIST 19 Feb 2026 10:13:45 -0000
@@ -1,3 +1,5 @@
+@conflict ruby34-puppetserver-ca-*
+@pkgpath sysutils/ruby-puppetserver-ca,ruby34
@comment ${GEM_BIN}/puppetserver-ca
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
Index: sysutils/ruby-openfact/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-openfact/Makefile,v
diff -u -r1.10 Makefile
--- sysutils/ruby-openfact/Makefile 17 Feb 2026 21:18:02 -0000 1.10
+++ sysutils/ruby-openfact/Makefile 19 Feb 2026 10:13:45 -0000
@@ -1,6 +1,7 @@
# octeon: ERROR Facter::InternalFactManager - unable to resolve type 'size_t'
# https://github.com/OpenVoxProject/openfact/issues/47

+REVISION = 0
COMMENT = system inventory tool
DISTNAME = openfact-5.4.0
CATEGORIES = sysutils
Index: sysutils/ruby-openfact/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/ruby-openfact/pkg/PLIST,v
diff -u -r1.5 PLIST
--- sysutils/ruby-openfact/pkg/PLIST 17 Feb 2026 21:18:02 -0000 1.5
+++ sysutils/ruby-openfact/pkg/PLIST 19 Feb 2026 10:13:45 -0000
@@ -1,5 +1,6 @@
@conflict ruby34-openfact-*
@pkgpath sysutils/ruby-openfact,ruby34
+@pkgpath sysutils/ruby-facter,ruby34
${GEM_BIN}/facter
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
diff -u -r1.1777 Makefile
--- devel/quirks/Makefile 11 Feb 2026 23:23:05 -0000 1.1777
+++ devel/quirks/Makefile 19 Feb 2026 10:13:45 -0000
@@ -3,7 +3,7 @@
DISTFILES =

# API.rev
-PKGNAME = quirks-7.184
+PKGNAME = quirks-7.185
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -r1.1789 Quirks.pm
--- devel/quirks/files/Quirks.pm 11 Feb 2026 23:23:05 -0000 1.1789
+++ devel/quirks/files/Quirks.pm 19 Feb 2026 10:13:45 -0000
@@ -513,6 +513,12 @@
'ruby34-r10k' => 'r10k',
'adobe-source-sans-pro' => 'adobe-source-sans',
'adobe-source-serif-pro' => 'adobe-source-serif',
+ 'puppet' => 'openvox',
+ 'puppetserver' => 'openvox-server',
+ 'ruby34-puppetserver-ca' => 'openvoxserver-ca',
+ 'puppetdb' => 'openvoxdb',
+ 'puppetdb-termini' => 'openvoxdb-termini',
+ 'ruby34-facter' => 'openfact',
};

my $obsolete_reason = {};

Hi,

openvox is now complete, agent and server side, so we can drop the EOL puppet related ports, that would include:

databases/puppetdb

sysutils/puppetserver

sysutils/ruby-puppet

sysutils/ruby-puppetserver-ca

sysutils/ruby-facter

I added @pkgpath to all of them, with intention to ease upgrades. However,with installed puppetdb and puppet, those corresponding ports say, "not installed" when trying to update openvoxdb or openvox. Make update in openvox-server at least attempts an upgrade, but then fails:

make update
===> Updating for openvox-server-8.12.1p1
Upgrading from puppetserver-8.7.0p0
puppet-8.10.0p4->openvox-8.24.2p10 forward dependencies:
| Dependency of puppetserver-8.7.0p0 on puppet-* doesn't match
| Dependency of puppetdb-termini-8.8.1 on puppet->=8.0.0,<9.0.0v0 doesn't match
Ambiguous: puppetserver-8.7.0p0 could be puppetserver-8.7.0p0 openvox-server-8.12.1p1
NOT MERGING: can't find update for puppetserver-8.7.0p0-> (ok)
Merging puppetdb-termini-8.8.1->8.8.1 (ok)
puppet-8.10.0p4->openvox-8.24.2p10 forward dependencies:
| Dependency of puppetserver-8.7.0p0 on puppet-* doesn't match
| Dependency of puppetdb-termini-8.8.1 on puppet->=8.0.0,<9.0.0v0 doesn't match
Ambiguous: puppetserver-8.7.0p0 could be puppetserver-8.7.0p0 openvox-server-8.12.1p1
NOT MERGING: can't find update for puppetserver-8.7.0p0-> (ok)
Merging puppetdb-termini-8.8.1->8.8.1 (ok)
puppetdb-termini-8.8.1->openvoxdb-termini-8.12.1p0 forward dependencies:
| Dependency of puppetserver-8.7.0p0 on puppetdb-termini-* doesn't match
Ambiguous: puppetserver-8.7.0p0 could be openvox-server-8.12.1p1 puppetserver-8.7.0p0
NOT MERGING: can't find update for puppetserver-8.7.0p0-> (ok)
ruby34-puppetserver-ca-2.7.1->openvoxserver-ca-3.0.0p0 forward dependencies:
| Dependency of puppetserver-8.7.0p0 on ruby34-puppetserver-ca-* doesn't match
Ambiguous: puppetserver-8.7.0p0 could be openvox-server-8.12.1p1 puppetserver-8.7.0p0
NOT MERGING: can't find update for puppetserver-8.7.0p0-> (ok)
Can't install puppetserver-8.7.0p0->openvox-server-8.12.1p1: can't resolve openvox-8.24.2p10,openvoxdb-termini-8.12.1p0,openvoxserver-ca-3.0.0p0
Couldn't find updates for puppet-8.10.0p4 puppetdb-termini-8.8.1 puppetserver-8.7.0p0 ruby34-puppetserver-ca-2.7.1
There were some ambiguities. Please run in interactive mode again.
Couldn't install openvox-8.24.2p10 openvox-server-8.12.1p1 openvoxdb-termini-8.12.1p0 openvoxserver-ca-3.0.0p0 puppetdb-termini-8.8.1

Upgrading ruby-facter -> openfact, and ruby-puppetserver-ca -> openfactserver-ca work well. The others are all in branches, maybe an issue with branches?

Any hint of what I'm missing is highly appreciated.

Sebastian