5 files changed, 0 insertions, 164 deletions
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