Index: head/sysutils/rubygem-puppetserver-ca/Makefile
===================================================================
--- head/sysutils/rubygem-puppetserver-ca/Makefile	(revision 554327)
+++ head/sysutils/rubygem-puppetserver-ca/Makefile	(revision 554328)
@@ -1,24 +1,19 @@
 # $FreeBSD$
 
 PORTNAME=	puppetserver-ca
-PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Ruby CLI tool to interact with the Puppet Server Certificate Authority
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gem
 USE_RUBY=	yes
 
 PLIST_FILES=	bin/puppetserver-ca
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
-		${WRKSRC}/lib/puppetserver/ca/config/puppet.rb
 
 .include <bsd.port.mk>
Index: head/sysutils/rubygem-puppetserver-ca/distinfo
===================================================================
--- head/sysutils/rubygem-puppetserver-ca/distinfo	(revision 554327)
+++ head/sysutils/rubygem-puppetserver-ca/distinfo	(revision 554328)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591137740
-SHA256 (rubygem/puppetserver-ca-1.8.0.gem) = 3783e2d89a8652726166b0768aabcca670119c7166465ce430cdc9a1853c3bce
-SIZE (rubygem/puppetserver-ca-1.8.0.gem) = 36352
+TIMESTAMP = 1604633593
+SHA256 (rubygem/puppetserver-ca-2.0.0.gem) = cbba83ce1058819b966b76b0070f45e7c5c343bbc722878b396e648ee57e0b7a
+SIZE (rubygem/puppetserver-ca-2.0.0.gem) = 37888
Index: head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb
===================================================================
--- head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb	(revision 554327)
+++ head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb	(revision 554328)
@@ -1,20 +1,11 @@
---- lib/puppetserver/ca/config/puppet.rb.orig	2018-09-28 10:36:20 UTC
+--- lib/puppetserver/ca/config/puppet.rb.orig	2020-11-06 21:46:06 UTC
 +++ lib/puppetserver/ca/config/puppet.rb
-@@ -48,7 +48,7 @@ module Puppetserver
-         def user_specific_conf_dir
-           @user_specific_conf_dir ||=
-             if Puppetserver::Ca::Utils::Config.running_as_root?
--              '/etc/puppetlabs/puppet'
-+              '%%PREFIX%%/etc/puppet'
-             else
-               "#{ENV['HOME']}/.puppetlabs/etc/puppet"
-             end
-@@ -100,7 +100,7 @@ module Puppetserver
+@@ -97,7 +97,7 @@ module Puppetserver
            # defaults below
            base_defaults = [
-             [:confdir, user_specific_conf_dir],
+             [:confdir, user_specific_puppet_confdir],
 -            [:ssldir,'$confdir/ssl'],
 +            [:ssldir,'/var/puppet/ssl'],
-             [:cadir, '$ssldir/ca'],
              [:certdir, '$ssldir/certs'],
              [:certname, default_certname],
+             [:server, 'puppet'],