Merged bug24559 into default

Author: Emile Joubert

packaging/macports/Portfile.in

@@ -92,21 +92,15 @@ post-destroot {
 
     xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
                 ${wrappersbin}/rabbitmq-server
-
-    reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:" \
-                ${filespath}/rabbitmq-script-wrapper
-    reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \
-                ${filespath}/rabbitmq-script-wrapper
-    reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \
-                ${filespath}/rabbitmq-script-wrapper
-
-    xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
+    reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:g" \
+                ${wrappersbin}/rabbitmq-server
+    reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:g" \
+                ${wrappersbin}/rabbitmq-server
+    reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:g" \
                 ${wrappersbin}/rabbitmq-server
-    xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
-                ${wrappersbin}/rabbitmqctl
-    xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
-                ${wrappersbin}/rabbitmq-plugins
 
+    file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmqctl
+    file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmq-plugins
 
     xinstall -m 644 -W ${mansrc}/man1 rabbitmq-server.1.gz rabbitmqctl.1.gz rabbitmq-plugins.1.gz \
         ${mandest}/man1/