Index: head/databases/puppetdb/Makefile =================================================================== --- head/databases/puppetdb/Makefile (revision 432524) +++ head/databases/puppetdb/Makefile (revision 432525) @@ -1,54 +1,54 @@ # $FreeBSD$ PORTNAME= puppetdb PORTVERSION= 2.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases java MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ MAINTAINER= xaque208@gmail.com COMMENT= PuppetDB storeconfigs backend LICENSE= APACHE20 RUN_DEPENDS= bash:shells/bash \ puppet:sysutils/puppet38 BUILD_DEPENDS= rubygem-facter>=0:sysutils/rubygem-facter \ rubygem-rake>=0:devel/rubygem-rake USE_RC_SUBR= puppetdb CONFLICTS_INSTALL= puppetdb3-* puppetdb4-* USES= shebangfix SHEBANG_FILES= ext/files/puppetdb \ ext/files/puppetdb-anonymize \ ext/files/puppetdb-export \ ext/files/puppetdb-foreground \ ext/files/puppetdb-import \ ext/files/puppetdb-legacy \ ext/files/puppetdb-ssl-setup USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.7+ USERS= puppetdb GROUPS= puppetdb SUB_LIST= JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message post-patch: .for file in tasks/install.rake ext/files/config.ini ext/files/puppetdb \ ext/files/puppetdb-import ext/files/puppetdb-anonymize \ ext/files/database.ini ext/files/puppetdb-ssl-setup \ ext/files/puppetdb-export ext/files/puppetdb-foreground Rakefile @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} .endfor do-install: @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} rake install .include Index: head/databases/puppetdb/files/patch-ext_master_lib_puppet_util_puppetdb_char__encoding.rb =================================================================== --- head/databases/puppetdb/files/patch-ext_master_lib_puppet_util_puppetdb_char__encoding.rb (nonexistent) +++ head/databases/puppetdb/files/patch-ext_master_lib_puppet_util_puppetdb_char__encoding.rb (revision 432525) @@ -0,0 +1,11 @@ +--- ext/master/lib/puppet/util/puppetdb/char_encoding.rb.orig 2015-10-13 22:23:24 UTC ++++ ext/master/lib/puppet/util/puppetdb/char_encoding.rb +@@ -33,7 +33,7 @@ module CharEncoding + + + def self.utf8_string(str) +- if RUBY_VERSION =~ /1.8/ ++ if RUBY_VERSION =~ /^1\.8/ + # Ruby 1.8 doesn't have String#encode and related methods, and there + # appears to be a bug in iconv that will interpret some byte sequences + # as 6-byte characters. Thus, we are forced to resort to some unfortunate Property changes on: head/databases/puppetdb/files/patch-ext_master_lib_puppet_util_puppetdb_char__encoding.rb ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property