git: 09c05e179fe4 - main - cleanup: Remove expired ports:

Rene Ladan rene at FreeBSD.org
Mon Jul 5 09:05:05 UTC 2021 

The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=09c05e179fe478091ebb7715d37462589010de8f

commit 09c05e179fe478091ebb7715d37462589010de8f
Author:     Rene Ladan <rene at FreeBSD.org>
AuthorDate: 2021-07-05 09:04:31 +0000
Commit:     Rene Ladan <rene at FreeBSD.org>
CommitDate: 2021-07-05 09:04:52 +0000

    cleanup: Remove expired ports:
    
    2021-07-01 databases/puppetdb5: Puppet 5 has reached EOL
    2021-07-01 sysutils/puppet5: Puppet 5 has reached EOL
    2021-07-01 sysutils/puppetserver5: Puppet 5 has reached EOL
    2021-07-01 databases/puppetdb-terminus5: Puppet 5 has reached EOL
---
 MOVED                                              |   4 +
 databases/Makefile                                 |   2 -
 databases/puppetdb-terminus5/Makefile              |  29 ------
 databases/puppetdb-terminus5/distinfo              |   3 -
 databases/puppetdb-terminus5/files/patch-Makefile  |  62 -----------
 databases/puppetdb-terminus5/pkg-descr             |   3 -
 databases/puppetdb-terminus5/pkg-plist             |  17 ---
 databases/puppetdb5/Makefile                       |  51 ---------
 databases/puppetdb5/distinfo                       |   3 -
 databases/puppetdb5/files/patch-Makefile           |  37 -------
 databases/puppetdb5/files/patch-ext_bin_puppetdb   |  15 ---
 databases/puppetdb5/files/patch-ext_cli_ssl-setup  |  11 --
 .../files/patch-ext_config_conf.d_config.ini       |  15 ---
 .../files/patch-ext_config_conf.d_jetty.ini        |   8 --
 .../puppetdb5/files/patch-ext_config_logback.xml   |  29 ------
 .../files/patch-ext_config_request-logging.xml     |  14 ---
 databases/puppetdb5/files/pkg-message.in           |  12 ---
 databases/puppetdb5/files/puppetdb.in              |  89 ----------------
 databases/puppetdb5/pkg-descr                      |   3 -
 databases/puppetdb5/pkg-plist                      |  22 ----
 sysutils/Makefile                                  |   2 -
 sysutils/puppet5/Makefile                          | 114 ---------------------
 sysutils/puppet5/distinfo                          |   3 -
 sysutils/puppet5/files/patch-ext__rack__config.ru  |  19 ----
 ...atch-lib_puppet_provider_service_daemontools.rb |  20 ----
 sysutils/puppet5/files/pkg-message.in              |  18 ----
 sysutils/puppet5/files/puppet.in                   |  46 ---------
 sysutils/puppet5/files/puppetmaster.in             |  61 -----------
 sysutils/puppet5/pkg-descr                         |   7 --
 sysutils/puppet5/pkg-plist                         |  45 --------
 sysutils/puppetserver5/Makefile                    |  85 ---------------
 sysutils/puppetserver5/distinfo                    |   3 -
 .../files/patch-ext__bin__puppetserver             |  15 ---
 .../files/patch-ext__cli_defaults__cli-defaults.sh |  11 --
 .../files/patch-ext__config__conf.d__global.conf   |   9 --
 .../patch-ext__config__conf.d__puppetserver.conf   |  56 ----------
 .../patch-ext__config__conf.d__webserver.conf      |   9 --
 .../files/patch-ext__config__logback.xml           |  17 ---
 .../files/patch-ext__config__request-logging.xml   |  15 ---
 sysutils/puppetserver5/files/pkg-message.in        |  17 ---
 sysutils/puppetserver5/files/puppetserver.in       |  95 -----------------
 sysutils/puppetserver5/pkg-descr                   |  13 ---
 sysutils/puppetserver5/pkg-plist                   |  26 -----
 43 files changed, 4 insertions(+), 1131 deletions(-)

diff --git a/MOVED b/MOVED
index 01f3fc365b3f..b5e55d5ec4bd 100644
--- a/MOVED
+++ b/MOVED
@@ -16458,3 +16458,7 @@ sysutils/ssid|sysutils/setsid|2021-06-27|Move to more obvious package name
 databases/pgpool-II-35||2021-07-01|Has expired: EOL since January 2021, please use one of the other pgpool-II-* ports
 sysutils/cdrtools-devel|sysutils/cdrtools|2021-07-01|Obsolete, use sysutils/cdrtools instead
 sysutils/sformat|sysutils/schilyutils|2021-07-01|Subsumed under sysutils/schilyutils
+databases/puppetdb5||2021-07-05|Has expired: Puppet 5 has reached EOL
+sysutils/puppet5||2021-07-05|Has expired: Puppet 5 has reached EOL
+sysutils/puppetserver5||2021-07-05|Has expired: Puppet 5 has reached EOL
+databases/puppetdb-terminus5||2021-07-05|Has expired: Puppet 5 has reached EOL
diff --git a/databases/Makefile b/databases/Makefile
index a20184cd63ca..a7d6db47bb01 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -727,10 +727,8 @@
     SUBDIR += proftpd-mod_sql_tds
     SUBDIR += prometheus-postgresql-adapter
     SUBDIR += pspg
-    SUBDIR += puppetdb-terminus5
     SUBDIR += puppetdb-terminus6
     SUBDIR += puppetdb-terminus7
-    SUBDIR += puppetdb5
     SUBDIR += puppetdb6
     SUBDIR += puppetdb7
     SUBDIR += puredb
diff --git a/databases/puppetdb-terminus5/Makefile b/databases/puppetdb-terminus5/Makefile
deleted file mode 100644
index 4759c816a847..000000000000
--- a/databases/puppetdb-terminus5/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-PORTNAME=	puppetdb-terminus
-PORTVERSION=	5.2.19
-CATEGORIES=	databases ruby
-MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
-PKGNAMESUFFIX=	5
-DISTNAME=	puppetdb-${PORTVERSION}
-
-MAINTAINER=	puppet at FreeBSD.org
-COMMENT=	PuppetDB storeconfigs backend terminus module
-
-LICENSE=	APACHE20
-
-DEPRECATED=	Puppet 5 has reached EOL
-EXPIRATION_DATE=2021-07-01
-
-BUILD_DEPENDS=	puppet5>=0:sysutils/puppet5
-
-CONFLICTS_INSTALL=	puppetdb-terminus6-* puppetdb-terminus7-*
-USE_RUBY=	yes
-NO_BUILD=	yes
-USES=		gmake
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile
-
-do-install:
-	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini
-
-.include <bsd.port.mk>
diff --git a/databases/puppetdb-terminus5/distinfo b/databases/puppetdb-terminus5/distinfo
deleted file mode 100644
index 4bb78f5cfe32..000000000000
--- a/databases/puppetdb-terminus5/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1603306983
-SHA256 (puppetdb-5.2.19.tar.gz) = dcdbe97bdee3d80dc6785143567ff0893027d71c2619f1f562b565c8ff9f296b
-SIZE (puppetdb-5.2.19.tar.gz) = 26891763
diff --git a/databases/puppetdb-terminus5/files/patch-Makefile b/databases/puppetdb-terminus5/files/patch-Makefile
deleted file mode 100644
index 11bbbff369e8..000000000000
--- a/databases/puppetdb-terminus5/files/patch-Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -1,7 +1,7 @@
- prefix = /usr/local
- datadir = $(prefix)/share
- confdir = /etc
--rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
-+rubylibdir = $(shell %%PREFIX%%/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
- rundir = /var/run
- bindir = /usr/bin
- 
-@@ -34,22 +34,34 @@
- 
- 
- install-puppetdb-termini:
--	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
--	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
--	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
--	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
--	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
--	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
--	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
--	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
--	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
--	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
--	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
--	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
--	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
-+	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
-+	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
-+	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
-+	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
-+	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
-+	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
-+	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
-+	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
-+	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
-+	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
-+	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
-+	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
-+	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
-+	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
-+	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
-+	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
- 
- install-rpm-sysv-init: install-rpm-preinst
- 	install -d -m 0755 "$(DESTDIR)$(initdir)"
diff --git a/databases/puppetdb-terminus5/pkg-descr b/databases/puppetdb-terminus5/pkg-descr
deleted file mode 100644
index 82720763fd9c..000000000000
--- a/databases/puppetdb-terminus5/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-The PuppetDB storeconfigs backend terminus module.
-
-WWW: https://docs.puppetlabs.com/puppetdb/latest/
diff --git a/databases/puppetdb-terminus5/pkg-plist b/databases/puppetdb-terminus5/pkg-plist
deleted file mode 100644
index a12b86eb6a1a..000000000000
--- a/databases/puppetdb-terminus5/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-%%RUBY_SITELIBDIR%%/puppet/face/node/deactivate.rb
-%%RUBY_SITELIBDIR%%/puppet/face/node/status.rb
-%%RUBY_SITELIBDIR%%/puppet/functions/puppetdb_query.rb
-%%RUBY_SITELIBDIR%%/puppet/indirector/catalog/puppetdb.rb
-%%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb.rb
-%%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb_apply.rb
-%%RUBY_SITELIBDIR%%/puppet/indirector/node/puppetdb.rb
-%%RUBY_SITELIBDIR%%/puppet/indirector/resource/puppetdb.rb
-%%RUBY_SITELIBDIR%%/puppet/reports/puppetdb.rb
-%%RUBY_SITELIBDIR%%/puppet/util/puppetdb.rb
-%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/atom.rb
-%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/char_encoding.rb
-%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command.rb
-%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command_names.rb
-%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/config.rb
-%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/http.rb
-
diff --git a/databases/puppetdb5/Makefile b/databases/puppetdb5/Makefile
deleted file mode 100644
index 2ee23f17e08b..000000000000
--- a/databases/puppetdb5/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-PORTNAME=	puppetdb
-PORTVERSION=	5.2.19
-CATEGORIES=	databases java
-MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
-PKGNAMESUFFIX=	5
-
-MAINTAINER=	puppet at FreeBSD.org
-COMMENT=	PuppetDB storeconfigs backend
-
-LICENSE=	APACHE20
-
-DEPRECATED=	Puppet 5 has reached EOL
-EXPIRATION_DATE=2021-07-01
-
-RUN_DEPENDS=	bash:shells/bash
-
-USE_RC_SUBR=	puppetdb
-
-CONFLICTS_INSTALL=	puppetdb6-* puppetdb7-*
-USES=		shebangfix
-SHEBANG_FILES=	ext/bin/puppetdb \
-		ext/cli/anonymize \
-		ext/cli/config-migration \
-		ext/cli/foreground \
-		ext/cli/upgrade \
-		ext/cli/ssl-setup \
-		ext/cli/start \
-		ext/cli/stop \
-		ext/cli/reload \
-		ext/ezbake-functions.sh
-USE_JAVA=	yes
-NO_ARCH=	yes
-NO_BUILD=	yes
-
-USERS=		puppetdb
-GROUPS=		puppetdb
-
-SUB_LIST=	JAVA_HOME=${JAVA_HOME}
-SUB_FILES=	pkg-message
-
-post-patch:
-.for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \
-	ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
-.endfor
-	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
-
-do-install:
-	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
-
-.include <bsd.port.mk>
diff --git a/databases/puppetdb5/distinfo b/databases/puppetdb5/distinfo
deleted file mode 100644
index d9a191cddd09..000000000000
--- a/databases/puppetdb5/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1603306965
-SHA256 (puppetdb-5.2.19.tar.gz) = dcdbe97bdee3d80dc6785143567ff0893027d71c2619f1f562b565c8ff9f296b
-SIZE (puppetdb-5.2.19.tar.gz) = 26891763
diff --git a/databases/puppetdb5/files/patch-Makefile b/databases/puppetdb5/files/patch-Makefile
deleted file mode 100644
index 5466cf74ae28..000000000000
--- a/databases/puppetdb5/files/patch-Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -1,23 +1,23 @@
--prefix = /usr/local
-+prefix = %%PREFIX%%
- datadir = $(prefix)/share
--confdir = /etc
-+confdir = %%PREFIX%%/etc
- rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
- rundir = /var/run
--bindir = /usr/bin
-+bindir = %%PREFIX%%/bin
- 
- install-puppetdb:
- 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb"
- 	install -m 0644 puppetdb.jar "$(DESTDIR)$(datadir)/puppetdb"
- 	install -m 0774 ext/ezbake-functions.sh "$(DESTDIR)$(datadir)/puppetdb"
- 	install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb"
--	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d"
--	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg"
--	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini"
--	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
--	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini"
--	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
--	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml"
--	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
-+	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d"
-+	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample"
-+	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample"
-+	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
-+	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample"
-+	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample"
-+	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample"
-+	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"
- 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli"
- 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps"
- 	install -d -m 0755 "$(DESTDIR)$(bindir)"
diff --git a/databases/puppetdb5/files/patch-ext_bin_puppetdb b/databases/puppetdb5/files/patch-ext_bin_puppetdb
deleted file mode 100644
index 0a139b110d2e..000000000000
--- a/databases/puppetdb5/files/patch-ext_bin_puppetdb
+++ /dev/null
@@ -1,15 +0,0 @@
---- ext/bin/puppetdb.orig	2016-03-17 04:17:10 UTC
-+++ ext/bin/puppetdb
-@@ -5,6 +5,12 @@ if [ -r "/etc/default/puppetdb" ] ; then
-     . /etc/default/puppetdb
- elif [ -r "/etc/sysconfig/puppetdb" ] ; then
-     . /etc/sysconfig/puppetdb
-+elif [ `uname` == "FreeBSD" ] ; then
-+    CONFIG="%%PREFIX%%/etc/puppetdb/conf.d"
-+    INSTALL_DIR="%%DATADIR%%"
-+    JAVA_BIN="%%PREFIX%%/bin/java"
-+    JAVA_ARGS="-Xmx192m"
-+    USER="puppet"
- elif [ `uname` == "OpenBSD" ] ; then
-     JAVA_BIN=$(javaPathHelper -c puppetdb)
-     JAVA_ARGS="-Xmx192m"
diff --git a/databases/puppetdb5/files/patch-ext_cli_ssl-setup b/databases/puppetdb5/files/patch-ext_cli_ssl-setup
deleted file mode 100644
index ab86d849142d..000000000000
--- a/databases/puppetdb5/files/patch-ext_cli_ssl-setup
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/cli/ssl-setup.orig	2016-03-17 04:17:10 UTC
-+++ ext/cli/ssl-setup
-@@ -230,7 +230,7 @@ else
-   user=puppetdb
-   group=puppetdb
- 
--  puppetdb_confdir="/etc/puppetlabs/puppetdb"
-+  puppetdb_confdir="%%PREFIX%%/etc/puppetdb"
- fi
- 
- set -e
diff --git a/databases/puppetdb5/files/patch-ext_config_conf.d_config.ini b/databases/puppetdb5/files/patch-ext_config_conf.d_config.ini
deleted file mode 100644
index 390068840508..000000000000
--- a/databases/puppetdb5/files/patch-ext_config_conf.d_config.ini
+++ /dev/null
@@ -1,15 +0,0 @@
---- ext/config/conf.d/config.ini.orig	2016-03-17 04:17:06 UTC
-+++ ext/config/conf.d/config.ini
-@@ -3,10 +3,10 @@
- 
- [global]
- # Store mq/db data in a custom directory
--vardir = /opt/puppetlabs/server/data/puppetdb
-+vardir = /var/db/puppetdb
- 
- # Use an external logback config file
--logging-config = /etc/puppetlabs/puppetdb/logback.xml
-+logging-config = %%PREFIX%%/etc/puppetdb/logback.xml
- 
- [command-processing]
- # How many command-processing threads to use, defaults to (CPUs / 2)
diff --git a/databases/puppetdb5/files/patch-ext_config_conf.d_jetty.ini b/databases/puppetdb5/files/patch-ext_config_conf.d_jetty.ini
deleted file mode 100644
index 42d5665a0f64..000000000000
--- a/databases/puppetdb5/files/patch-ext_config_conf.d_jetty.ini
+++ /dev/null
@@ -1,8 +0,0 @@
---- ext/config/conf.d/jetty.ini.orig	2016-03-17 04:17:06 UTC
-+++ ext/config/conf.d/jetty.ini
-@@ -30,4 +30,4 @@ port = 8080
- 
- # Access logging configuration path. To turn off access logging
- # comment out the line with `access-log-config=...`
--access-log-config = /etc/puppetlabs/puppetdb/request-logging.xml
-+access-log-config = %%PREFIX%%/etc/puppetdb/request-logging.xml
diff --git a/databases/puppetdb5/files/patch-ext_config_logback.xml b/databases/puppetdb5/files/patch-ext_config_logback.xml
deleted file mode 100644
index 08cb543440aa..000000000000
--- a/databases/puppetdb5/files/patch-ext_config_logback.xml
+++ /dev/null
@@ -1,29 +0,0 @@
---- ext/config/logback.xml.orig	2017-04-24 12:27:57.366296793 -0700
-+++ ext/config/logback.xml	2017-04-24 12:28:48.723259627 -0700
-@@ -6,10 +6,10 @@
-     </appender>
- 
-     <appender name="F1" class="ch.qos.logback.core.rolling.RollingFileAppender">
--        <file>/var/log/puppetlabs/puppetdb/puppetdb.log</file>
-+        <file>/var/log/puppetdb/puppetdb.log</file>
-         <append>true</append>
-         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
--            <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-+            <fileNamePattern>/var/log/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-             <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total-->
-             <maxFileSize>200MB</maxFileSize>
-             <maxHistory>90</maxHistory>
-@@ -31,11 +31,11 @@
-         level="info"/>
- 
-     <appender name="STATUS" class="ch.qos.logback.core.rolling.RollingFileAppender">
--        <file>/var/log/puppetlabs/puppetdb/puppetdb-status.log</file>
-+        <file>/var/log/puppetdb/puppetdb-status.log</file>
-         <append>true</append>
-         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-             <!-- rollover daily -->
--            <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-status-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-+            <fileNamePattern>/var/log/puppetdb/puppetdb-status-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-             <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total-->
-             <maxFileSize>200MB</maxFileSize>
-             <maxHistory>90</maxHistory>
diff --git a/databases/puppetdb5/files/patch-ext_config_request-logging.xml b/databases/puppetdb5/files/patch-ext_config_request-logging.xml
deleted file mode 100644
index 51b90d0e844e..000000000000
--- a/databases/puppetdb5/files/patch-ext_config_request-logging.xml
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/config/request-logging.xml.orig	2017-04-24 12:32:16.604464262 -0700
-+++ ext/config/request-logging.xml	2017-04-24 12:32:46.404637027 -0700
-@@ -1,9 +1,9 @@
- <configuration debug="false">
-     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
--        <file>/var/log/puppetlabs/puppetdb/puppetdb-access.log</file>
-+        <file>/var/log/puppetdb/puppetdb-access.log</file>
-         <append>true</append>
-         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
--            <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-+            <fileNamePattern>/var/log/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-             <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total-->
-             <maxFileSize>200MB</maxFileSize>
-             <maxHistory>90</maxHistory>
diff --git a/databases/puppetdb5/files/pkg-message.in b/databases/puppetdb5/files/pkg-message.in
deleted file mode 100644
index fba773047854..000000000000
--- a/databases/puppetdb5/files/pkg-message.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-If this is a new installation, please run the follow to setup your SSL/puppetdb
-server:
-
-%%PREFIX%%/bin/puppetdb ssl-setup
-
-Please also remember to add puppetdb_enable="YES" into your rc.conf.
-EOM
-}
-]
diff --git a/databases/puppetdb5/files/puppetdb.in b/databases/puppetdb5/files/puppetdb.in
deleted file mode 100644
index 3ffee580818e..000000000000
--- a/databases/puppetdb5/files/puppetdb.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: puppetdb
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Configuration settings for puppetdb in /etc/rc.conf:
-#
-# puppetdb_enable (bool):
-#   Set to "NO" by default.
-#   Set it to "YES" to enable puppetdb
-#
-# puppetdb_args (str):
-#   Extra arguments passed to start command
-#
-# puppetdb_java_home (str):
-#   Set to "%%JAVA_HOME%%" by default.
-#   Set the Java virtual machine to run puppetdb
-#
-# puppetdb_java_opts (str):
-#   Set to "" by default.
-#   Java VM args to use.
-#
-# puppetdb_user (str):
-#   Set to "puppetdb" by default.
-#   User to run puppetdb as.
-#
-# puppetdb_group (str):
-#   Set to "puppetdb" by default.
-#   Group for data file ownership.
-#
-# puppetdb_log_file (str):
-#   Set to "/var/log/puppetdb/puppetdb.log" by default.
-#   Log file location.
-#
-
-. /etc/rc.subr
-
-name="puppetdb"
-rcvar=puppetdb_enable
-
-load_rc_config "${name}"
-
-: ${puppetdb_enable="NO"}
-: ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"}
-: ${puppetdb_java_home="%%JAVA_HOME%%"}
-: ${puppetdb_user="puppetdb"}
-: ${puppetdb_group="puppetdb"}
-: ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"}
-
-pidfile="/var/run/puppetdb/puppetdb.pid"
-command="/usr/sbin/daemon"
-java_cmd="${puppetdb_java_home}/bin/java"
-procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main  ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
-
-
-required_files="${java_cmd}"
-
-start_precmd="puppetdb_prestart"
-
-puppetdb_prestart() {
-  if [ ! -d "/var/log/puppetdb" ]; then
-    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/log/puppetdb"
-  fi
-  if [ ! -f "${puppetdb_log_file}" ]; then
-    touch "${puppetdb_log_file}"
-    chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}"
-    chmod 640 "${puppetdb_log_file}"
-  fi
-  if [ ! -d "/var/run/puppetdb" ]; then
-    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb"
-  fi
-
-  chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d"
-  chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d"
-
-  chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml"
-  chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml"
-
-  if [ ! -d "/var/db/puppetdb" ]; then
-    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/db/puppetdb"
-  fi
-  chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb"
-  chmod 0750 "/var/db/puppetdb"
-}
-
-run_rc_command "$1"
diff --git a/databases/puppetdb5/pkg-descr b/databases/puppetdb5/pkg-descr
deleted file mode 100644
index 47fcde3773c6..000000000000
--- a/databases/puppetdb5/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-The PuppetDB storeconfigs backend
-
-WWW: https://docs.puppetlabs.com/puppetdb/latest/
diff --git a/databases/puppetdb5/pkg-plist b/databases/puppetdb5/pkg-plist
deleted file mode 100644
index 852aa24ab949..000000000000
--- a/databases/puppetdb5/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-bin/puppetdb
-%%DATADIR%%/cli/apps/anonymize
-%%DATADIR%%/cli/apps/config-migration
-%%DATADIR%%/cli/apps/delete-reports
-%%DATADIR%%/cli/apps/foreground
-%%DATADIR%%/cli/apps/reload
-%%DATADIR%%/cli/apps/ssl-setup
-%%DATADIR%%/cli/apps/start
-%%DATADIR%%/cli/apps/stop
-%%DATADIR%%/cli/apps/upgrade
-%%DATADIR%%/ezbake-functions.sh
-%%DATADIR%%/ezbake.manifest
-%%DATADIR%%/puppetdb.jar
- at group puppetdb
- at sample etc/puppetdb/bootstrap.cfg.sample
- at sample etc/puppetdb/conf.d/config.ini.sample
- at sample etc/puppetdb/conf.d/database.ini.sample
- at sample etc/puppetdb/conf.d/jetty.ini.sample
- at sample etc/puppetdb/conf.d/repl.ini.sample
- at sample etc/puppetdb/logback.xml.sample
- at sample etc/puppetdb/request-logging.xml.sample
- at group
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 3a497f333125..ed294dc1fb2c 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -984,10 +984,8 @@
     SUBDIR += pstree
     SUBDIR += puppet-lint
     SUBDIR += puppet-mode.el
-    SUBDIR += puppet5
     SUBDIR += puppet6
     SUBDIR += puppet7
-    SUBDIR += puppetserver5
     SUBDIR += puppetserver6
     SUBDIR += puppetserver7
     SUBDIR += pv
diff --git a/sysutils/puppet5/Makefile b/sysutils/puppet5/Makefile
deleted file mode 100644
index af911e2d895c..000000000000
--- a/sysutils/puppet5/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-PORTNAME=	puppet
-PORTVERSION=	5.5.22
-PORTREVISION=	1
-CATEGORIES=	sysutils
-MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
-PKGNAMESUFFIX=	5
-
-MAINTAINER=	puppet at FreeBSD.org
-COMMENT=	Configuration management framework written in Ruby
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Puppet 5 has reached EOL
-EXPIRATION_DATE=2021-07-01
-# maybe a newer version like puppet 6.x or 7.x must be used to work with ruby 2.7
-BROKEN_RUBY27=	yes
-
-RUN_DEPENDS=	rubygem-fast_gettext1>=1.1.2:devel/rubygem-fast_gettext1 \
-		rubygem-hiera>=3.2.1:sysutils/rubygem-hiera \
-		rubygem-locale>=2.1:devel/rubygem-locale \
-		rubygem-multi_json>=1.10:devel/rubygem-multi_json
-
-USES=		cpe
-CPE_VENDOR=	puppetlabs
-CONFLICTS_INSTALL=	puppet6-* puppet7-*
-NO_ARCH=	yes
-NO_BUILD=	yes
-USE_RUBY=	yes
-USE_RC_SUBR=	puppet puppetmaster
-PORTDOCS=	LICENSE README.md
-PORTEXAMPLES=	*
-USERS=		puppet
-GROUPS=		puppet
-SUB_FILES+=	pkg-message
-SUB_LIST=	RUBY=${RUBY}
-
-OPTIONS_DEFINE=		DOCS EXAMPLES
-OPTIONS_DEFAULT=	CFACTER
-OPTIONS_RADIO=		FACTER
-OPTIONS_RADIO_FACTER=	CFACTER RFACTER
-
-RFACTER_DESC=	Use facter 4.x (future facter, written in Ruby)
-CFACTER_DESC=	Use facter 3.x (written in C++)
-
-RFACTER_BUILD_DEPENDS=	rubygem-facter>=4.0:sysutils/rubygem-facter
-RFACTER_RUN_DEPENDS=	rubygem-facter>=4.0:sysutils/rubygem-facter
-
-CFACTER_BUILD_DEPENDS=	facter>=3.0:sysutils/facter
-CFACTER_RUN_DEPENDS=	facter>=3.0:sysutils/facter
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \
-		${WRKSRC}/install.rb \
-		${WRKSRC}/lib/puppet/reference/configuration.rb \
-		${WRKSRC}/lib/puppet/util/run_mode.rb
-	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/code|${ETCDIR}|" \
-		${WRKSRC}/install.rb \
-		${WRKSRC}/lib/puppet/reference/configuration.rb \
-		${WRKSRC}/lib/puppet/util/run_mode.rb
-	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/cache|/var/puppet|" \
-		${WRKSRC}/install.rb \
-		${WRKSRC}/lib/puppet/reference/configuration.rb \
-		${WRKSRC}/lib/puppet/util/run_mode.rb
-	@${REINPLACE_CMD} -e "s|/var/run/puppetlabs|/var/run/puppet|" \
-		${WRKSRC}/install.rb \
-		${WRKSRC}/lib/puppet/util/run_mode.rb
-	@${REINPLACE_CMD} -e "s|/var/log/puppetlabs/puppet|/var/log/puppet|" \
-		${WRKSRC}/install.rb \
-		${WRKSRC}/lib/puppet/util/run_mode.rb
-	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/modules|${ETCDIR}/modules|" \
-		${WRKSRC}/lib/puppet/defaults.rb
-	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/bin/gem|${LOCALBASE}/bin/gem|" \
-		${WRKSRC}/lib/puppet/provider/package/puppet_gem.rb
-	@${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \
-		${WRKSRC}/lib/puppet/defaults.rb
-	@${REINPLACE_CMD} -e "s|\.\./\.\./\.\./locales|../locales|" \
-		${WRKSRC}/lib/puppet/gettext/config.rb
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
-		${WRKSRC}/ext/rack/config.ru
-
-do-install:
-	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \
-		--localedir=${RUBY_SITELIBDIR}/puppet/locales
-
-post-install:
-	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests
-	${MKDIR} ${STAGEDIR}${ETCDIR}/modules
-	${MKDIR} ${STAGEDIR}/var/puppet
-	${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist
-	${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \
-		--confdir=${ETCDIR} \
-		--rundir=/var/run/puppet \
-		--vardir=/var/puppet \
-		--logdir=/var/log/puppet \
-		--codedir=${ETCDIR} \
-		> ${STAGEDIR}${ETCDIR}/puppet.conf-dist
-	@${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \
-		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
-		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
-	@${MKDIR} ${STAGEDIR}${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR}
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
-post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/ext/rack/example-passenger-vhost.conf ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
diff --git a/sysutils/puppet5/distinfo b/sysutils/puppet5/distinfo
deleted file mode 100644
index 60598fdd908f..000000000000
--- a/sysutils/puppet5/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1603306720
-SHA256 (puppet-5.5.22.tar.gz) = 2f7c68887f823a4b1f25c810702faf730779d5347d16bb604666f3c445ccc0ed
-SIZE (puppet-5.5.22.tar.gz) = 2998132
diff --git a/sysutils/puppet5/files/patch-ext__rack__config.ru b/sysutils/puppet5/files/patch-ext__rack__config.ru
deleted file mode 100644
index 51facb111557..000000000000
--- a/sysutils/puppet5/files/patch-ext__rack__config.ru
+++ /dev/null
@@ -1,19 +0,0 @@
---- ext/rack/config.ru.orig	2015-08-09 23:14:59 UTC
-+++ ext/rack/config.ru
-@@ -14,11 +14,11 @@ ARGV << "--rack"
- # Rack applications typically don't start as root.  Set --confdir, --vardir,
- # --logdir, --rundir to prevent reading configuration from
- # ~/ based pathing.
--ARGV << "--confdir" << "/etc/puppetlabs/puppet"
--ARGV << "--vardir"  << "/opt/puppetlabs/server/data/puppetmaster"
--ARGV << "--logdir"  << "/var/log/puppetlabs/puppetmaster"
--ARGV << "--rundir"  << "/var/run/puppetlabs/puppetmaster"
--ARGV << "--codedir"  << "/etc/puppetlabs/code"
-+ARGV << "--confdir" << "%%PREFIX%%/etc/puppet"
-+ARGV << "--vardir"  << "/var/puppet"
-+ARGV << "--logdir"  << "/var/log/puppet"
-+ARGV << "--rundir"  << "/var/run/puppet"
-+ARGV << "--codedir" << "%%PREFIX%%/etc/puppet"
- 
- # always_cache_features is a performance improvement and safe for a master to
- # apply. This is intended to allow agents to recognize new features that may be
diff --git a/sysutils/puppet5/files/patch-lib_puppet_provider_service_daemontools.rb b/sysutils/puppet5/files/patch-lib_puppet_provider_service_daemontools.rb
deleted file mode 100644
index 3857c824a1ba..000000000000
--- a/sysutils/puppet5/files/patch-lib_puppet_provider_service_daemontools.rb
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/puppet/provider/service/daemontools.rb.orig	2016-04-25 18:52:09 UTC
-+++ lib/puppet/provider/service/daemontools.rb
-@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :dae
- 
-   EOT
- 
--  commands :svc  => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
-+  commands :svc  => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat"
- 
-   class << self
-     attr_writer :defpath
-@@ -88,7 +88,7 @@ Puppet::Type.type(:service).provide :dae
-   # find the service dir on this node
-   def servicedir
-     unless @servicedir
--      ["/service", "/etc/service","/var/lib/svscan"].each do |path|
-+      ["/var/service", "/etc/service","/var/lib/svscan"].each do |path|
-         if Puppet::FileSystem.exist?(path)
-           @servicedir = path
-           break
diff --git a/sysutils/puppet5/files/pkg-message.in b/sysutils/puppet5/files/pkg-message.in
deleted file mode 100644
index b7f42c483592..000000000000
--- a/sysutils/puppet5/files/pkg-message.in
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-To enable the puppet agent, add the following to /etc/rc.conf:
-
-	puppet_enable="YES"
-
-To enable the puppetmaster, add the following to /etc/rc.conf:
-
-	puppetmaster_enable="YES"
-
-Individual config files such as %%PREFIX%%/etc/puppetmasterd.conf are
-deprecated. Use a single file, %%ETCDIR%%/puppet.conf.
-
-The default PID directory is /var/run/puppet
-EOM
-}
-]
diff --git a/sysutils/puppet5/files/puppet.in b/sysutils/puppet5/files/puppet.in
deleted file mode 100644
index fbdfef003ed5..000000000000
--- a/sysutils/puppet5/files/puppet.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: puppet
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable the puppet agent:
-#
-# puppet_enable="YES"
-
-. /etc/rc.subr
-
-name="puppet"
-rcvar=puppet_enable
-
-load_rc_config "$name"
-
-: ${puppet_enable="NO"}
-: ${puppet_rundir="/var/run/puppet"}
-
-command="%%PREFIX%%/bin/puppet"
-command_args="agent ${puppet_flags} --rundir=${puppet_rundir}"
-command_interpreter=%%RUBY%%
-unset puppet_flags
-
-pidfile="${puppet_rundir}/agent.pid"
-start_precmd="install -d -o puppet -g puppet ${pidfile%/*}"
-
-PATH="${PATH}:%%PREFIX%%/bin:%%PREFIX%%/sbin"
-
-# An UTF-8 locale is required
-: LC_ALL=${LC_ALL:=C.UTF-8}
-case $LC_ALL in
-    *.UTF-8)
-	;;
-    *.*)
-	LC_ALL="${LC_ALL%.*}.UTF-8"
-	;;
-    *)
-	LC_ALL=C.UTF-8
-	;;
-esac
-export LC_ALL
-
-run_rc_command "$1"
diff --git a/sysutils/puppet5/files/puppetmaster.in b/sysutils/puppet5/files/puppetmaster.in
deleted file mode 100644
index fcd0fffe74c9..000000000000
--- a/sysutils/puppet5/files/puppetmaster.in
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: puppetmaster
-# REQUIRE: LOGIN
-
-# Add the following lines to /etc/rc.conf to enable the puppetmaster:
-#
-# puppetmaster_enable="YES"
-#
-
-. /etc/rc.subr
-
-name="puppetmaster"
-rcvar=puppetmaster_enable
-
-load_rc_config "${name}"
-
-: ${puppetmaster_enable="NO"}
-: ${puppetmaster_rundir="/var/run/puppet"}
-: ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"}
-
-command_interpreter=%%RUBY%%
-command="%%PREFIX%%/bin/puppet"
-command_args="master ${puppetmaster_flags}"
-unset puppetmaster_flags
-
-pidfile="${puppetmaster_rundir}/master.pid"
-
-start_precmd="puppetmaster_checkconfig"
-restart_precmd="puppetmaster_checkconfig"
-puppetmaster_checkconfig() {
-	puppet_manifest="$($command config print --section=main manifest 2> /dev/null)"
-	cat << EOT
-================================================================================
-The Rack and WEBrick Puppet master servers are deprecated and will be removed
-in a future release. Please use Puppet Server instead (sysutils/puppetserver5).
-
-See http://links.puppet.com/deprecate-rack-webrick-servers for more information.
-================================================================================
-EOT
-	echo -n "Performing sanity check of ${name} configuration: "
-	if ! ${command} parser validate "${puppet_manifest}"
-	then
-		echo "FAILED"
-		return 1
-	else
-		echo "OK"
-		return 0
-	fi
-}
-
-if [ -z "${puppetmaster_mongrel_ports}" ]; then
-	run_rc_command "$1"
-else
-	for port in ${puppetmaster_mongrel_ports}; do
-		pidfile="${puppetmaster_rundir}/mongrel.${port}.pid"
-		command_args="master --pidfile=${pidfile} --servertype=mongrel --masterport=${port}"
-		run_rc_command "$1"
-		_rc_restart_done="false"
-	done
-fi
diff --git a/sysutils/puppet5/pkg-descr b/sysutils/puppet5/pkg-descr
deleted file mode 100644
index 9d40dc90e9cc..000000000000
--- a/sysutils/puppet5/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Puppet lets you centrally manage every important aspect of your system using
-a cross-platform specification language that manages all the separate
-elements normally aggregated in different files, like users, cron jobs, and
-hosts, along with obviously discrete elements like packages, services, and
-files.
-
-WWW: https://puppet.com/docs/puppet/latest/puppet_index.html
diff --git a/sysutils/puppet5/pkg-plist b/sysutils/puppet5/pkg-plist
deleted file mode 100644
index 9a94f5abf784..000000000000
--- a/sysutils/puppet5/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-bin/puppet
-%%ETCDIR%%/auth.conf-dist
-%%ETCDIR%%/puppet.conf-dist
-%%RUBY_SITELIBDIR%%/hiera/puppet_function.rb
-%%RUBY_SITELIBDIR%%/hiera/scope.rb
-%%RUBY_SITELIBDIR%%/hiera_puppet.rb
-%%RUBY_SITELIBDIR%%/puppet_pal.rb
-%%RUBY_SITELIBDIR%%/puppet_x.rb
-man/man5/puppet.conf.5.gz
-man/man8/puppet-agent.8.gz
*** 484 LINES SKIPPED ***

More information about the dev-commits-ports-main mailing list