Cleanup launchd exporter

Also suppresses the deprecation warning for the launchd exporter when
using port instead of engine.port_for

data/export/launchd/launchd.plist.erb

@@ -6,10 +6,10 @@
     <string><%= "#{app}-#{name}-#{num}" %></string>
     <key>EnvironmentVariables</key>
     <dict>
-    <% engine.env.merge("PORT" => port).each_pair do |var,env| %>
+    <%- engine.env.merge("PORT" => port).each_pair do |var,env| -%>
-      <key><%= var.upcase %></key>
+        <key><%= var.upcase %></key>
-      <string><%= env %></string>
+        <string><%= env %></string>
-    <% end %>
+    <%- end -%>
     </dict>
     <key>ProgramArguments</key>
     <array>

lib/foreman/export/launchd.rb

@@ -7,6 +7,7 @@ class Foreman::Export::Launchd < Foreman::Export::Base
     super
     engine.each_process do |name, process|
       1.upto(engine.formation[name]) do |num|
+        port = engine.port_for(process, num)
         write_template "launchd/launchd.plist.erb", "#{app}-#{name}-#{num}.plist", binding
       end
     end

spec/resources/export/launchd/launchd-a.default

@@ -6,10 +6,8 @@
     <string>app-alpha-1</string>
     <key>EnvironmentVariables</key>
     <dict>
-    
+        <key>PORT</key>
-      <key>PORT</key>
+        <string>5000</string>
-      <string>5000</string>
-    
     </dict>
     <key>ProgramArguments</key>
     <array>

spec/resources/export/launchd/launchd-b.default

@@ -6,10 +6,8 @@
     <string>app-bravo-1</string>
     <key>EnvironmentVariables</key>
     <dict>
-    
+        <key>PORT</key>
-      <key>PORT</key>
+        <string>5100</string>
-      <string>5000</string>
-    
     </dict>
     <key>ProgramArguments</key>
     <array>