[139970] trunk/dports/net/rabbitmq-server

[cal at macports.org]

Revision: 139970
          https://trac.macports.org/changeset/139970
Author:   cal at macports.org
Date:     2015-09-04 12:23:57 -0700 (Fri, 04 Sep 2015)
Log Message:
-----------
rabbitmq-server: update to 3.5.4, add new maintainer, closes #48752

Modified Paths:
--------------
    trunk/dports/net/rabbitmq-server/Portfile
    trunk/dports/net/rabbitmq-server/files/patch-org.macports.rabbitmq-server.plist.diff

Modified: trunk/dports/net/rabbitmq-server/Portfile
===================================================================
--- trunk/dports/net/rabbitmq-server/Portfile	2015-09-04 19:19:40 UTC (rev 139969)
+++ trunk/dports/net/rabbitmq-server/Portfile	2015-09-04 19:23:57 UTC (rev 139970)
@@ -4,11 +4,10 @@
 PortSystem          1.0
 
 name                rabbitmq-server
-version             3.1.5
-revision            2
+version             3.5.4
 categories          net
 platforms           darwin
-maintainers         nomaintainer
+maintainers         gmail.com:hayder.net
 license             MPL-1.1 MIT Apache-2
 supported_archs     noarch
 
@@ -26,12 +25,13 @@
 
 checksums \
         ${name}-${version}${extract.suffix} \
-                    rmd160  b486ce1289fb721b63d9401b3f9994adeba1c053 \
-                    sha256  c6952bdd0f0d9551fa4a068e65ad6506583a3e81babbb4e4747e0073366a6c35 \
+                    rmd160  4e1cf0ca1889673c56872a6dfaf9e688899d1eda \
+                    sha256  f79814d5fd5574734f599ef570ddace02ce4e47a1441cd052c568cde4d6ca3a4 \
         ${name}-generic-unix-${version}${extract.suffix} \
-                    rmd160  84b4cab15893eedfa2fbce80e7dfdbcc9cb4e536 \
-                    sha256  bf76aa8bdb59a412187c66a7a0739f2b18b069fd3af3fc6e1f66b0518d73978f
+                    rmd160  f178b3cb8d4ab9299f8ecabe338d2d2f79e82fb3 \
+                    sha256  24b6a4c0d5fec0ed63b756cdf96964d1729be88d5ec7934d4b4723ecdf9d3e2b
 
+
 depends_lib         port:erlang
 depends_build       port:libxslt \
                     port:git
@@ -87,12 +87,17 @@
     ${destroot}${logdir} \
     ${destroot}${mnesiadbdir}
 
-pre-destroot {
-    addgroup    ${servergroup}
-    add_users   ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome}
-}
+add_users ${serveruser} group=${servergroup} realname=RabbitMQ\ Server home=${serverhome}
 
 post-destroot {
+    # This is a hack: We need to patch the startupitem, so generate it manually
+    # here, then define the function to empty to avoid overwriting it later
+    package require portstartupitem 1.0
+    portstartupitem::startupitem_create
+    proc portstartupitem::startupitem_create {args} {}
+    system -W "${destroot}${plistloc}" "patch <${filespath}/patch-org.macports.rabbitmq-server.plist.diff"
+
+
     xinstall -d -m 775 ${destroot}${confdir}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${logdir}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${serverhome}
@@ -114,16 +119,14 @@
 
     file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmqctl
     file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmq-plugins
+    file attributes ${destroot}${serverhome} -owner ${serveruser} -group ${servergroup}
+    file attributes ${destroot}${logdir} -owner ${serveruser} -group ${servergroup}
 
     xinstall -m 644 -W ${mansrc}/man1 rabbitmq-server.1.gz rabbitmqctl.1.gz rabbitmq-plugins.1.gz \
         ${mandest}/man1/
     xinstall -m 644 -W ${mansrc}/man5 rabbitmq-env.conf.5.gz ${mandest}/man5/
 }
 
-pre-install {
-    system "cd ${destroot}${plistloc}; patch <${filespath}/patch-org.macports.rabbitmq-server.plist.diff"
-}
-
 startupitem.create  yes
 startupitem.init    "PATH=${prefix}/bin:${prefix}/sbin:\$PATH; export PATH"
 startupitem.start   "rabbitmq-server 2>&1"

Modified: trunk/dports/net/rabbitmq-server/files/patch-org.macports.rabbitmq-server.plist.diff
===================================================================
--- trunk/dports/net/rabbitmq-server/files/patch-org.macports.rabbitmq-server.plist.diff	2015-09-04 19:19:40 UTC (rev 139969)
+++ trunk/dports/net/rabbitmq-server/files/patch-org.macports.rabbitmq-server.plist.diff	2015-09-04 19:23:57 UTC (rev 139970)
@@ -1,5 +1,5 @@
---- org.macports.rabbitmq-server.plist.old	2009-02-26 08:00:31.000000000 -0800
-+++ org.macports.rabbitmq-server.plist	2009-02-26 08:01:27.000000000 -0800
+--- org.macports.rabbitmq-server.plist.orig	2015-09-04 00:19:56.000000000 +0200
++++ org.macports.rabbitmq-server.plist	2015-09-04 00:19:56.000000000 +0200
 @@ -22,6 +22,7 @@
  	<string>;</string>
  	<string>--pid=none</string>
@@ -7,4 +7,4 @@
 +<key>UserName</key><string>rabbitmq</string>
  <key>Debug</key><false/>
  <key>Disabled</key><true/>
- <key>OnDemand</key><false/>
+ <key>KeepAlive</key><true/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150904/6b757f4f/attachment.html>