Rework locales

Generate .mo files from the .po ones, and install them in the proper
directory.

sysutils/puppet5/Makefile

@@ -19,7 +19,7 @@ RUN_DEPENDS=	rubygem-hiera>=2.0:sysutils/rubygem-hiera \
 		rubygem-json_pure>=0:devel/rubygem-json_pure \
 		rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas
 
-USES=		cpe
+USES=		cpe gettext-tools
 CPE_VENDOR=	puppetlabs
 CONFLICTS_INSTALL=	puppet4-*
 NO_ARCH=	yes
@@ -72,14 +72,14 @@ post-patch:
 		${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|\.\./\.\./\.\./share/locale|/var/puppet/share/locales|" \
-		${WRKSRC}/lib/puppet.rb
+	@${REINPLACE_CMD} -e "s|\.\./\.\./\.\./\.\./\.\./share/locale|/var/puppet/share/locale|" \
+		${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=/var/puppet/share/locales
+		--localedir=/var/puppet/share/locale
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests

sysutils/puppet5/files/patch-install.rb

@@ -0,0 +1,21 @@
+--- install.rb.orig
++++ install.rb
+@@ -120,13 +120,15 @@
+
+ def do_locales(locale, strip = 'locales/')
+   locale.each do |lf|
+-    next if File.directory? lf
+-    olf = File.join(InstallOptions.locale_dir, lf.sub(/^#{strip}/, ''))
++    next unless File.extname(lf) == '.po'
++    olf = File.join(InstallOptions.locale_dir, File.dirname(lf.sub(/^#{strip}/, '')), 'LC_MESSAGES', File.basename(lf, '.po') + '.mo')
+     op = File.dirname(olf)
+     FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
+     FileUtils.chmod(0755, op)
+-    FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
++    `msgfmt -o #{olf} #{lf}`
++    FileUtils.chmod(0644, olf)
+   end
++  FileUtils.install('locales/config.yaml', File.join(InstallOptions.locale_dir, 'config.yaml'), {:mode => 0644, :verbose => true})
+ end
+
+ # Verify that all of the prereqs are installed

sysutils/puppet5/pkg-plist

@@ -35,15 +35,15 @@ man/man8/puppet-report.8.gz
 man/man8/puppet-resource.8.gz
 man/man8/puppet-status.8.gz
 man/man8/puppet.8.gz
-/var/puppet/share/locales/config.yaml
-/var/puppet/share/locales/ja/puppet.po
-/var/puppet/share/locales/puppet.pot
+/var/puppet/share/locale/config.yaml
+/var/puppet/share/locale/ja/LC_MESSAGES/puppet.mo
 @(puppet,puppet,) %%WWWDIR%%/config.ru
 @dir(puppet,puppet,) %%ETCDIR%%/manifests
 @dir(puppet,puppet,) %%ETCDIR%%/modules
 @dir(puppet,puppet,) /var/puppet
 @dir(puppet,puppet,) /var/puppet/share
-@dir(puppet,puppet,) /var/puppet/share/locales
-@dir(puppet,puppet,) /var/puppet/share/locales/ja
+@dir(puppet,puppet,) /var/puppet/share/locale
+@dir(puppet,puppet,) /var/puppet/share/locale/ja
+@dir(puppet,puppet,) /var/puppet/share/locale/ja/LC_MESSAGES
 @dir(puppet,puppet,) /var/log/puppet
 @dir /var/run/puppet