Ticket #52428: rabbitmq-server.patch

dports/net/rabbitmq-server/Portfile

@@ -2 +2 @@
 # $Id$
 
 PortSystem          1.0
 
 name                rabbitmq-server
-version             3.5.7
+version             3.6.5
 categories          net
 platforms           darwin
 maintainers         gmail.com:hayder.net
 license             MPL-1.1 MIT Apache-2
 supported_archs     noarch
@@ -18 +18 @@
     robust and scalable implementation of an AMQP broker.
 
 homepage            http://www.rabbitmq.com/
 master_sites        http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/
 
-distfiles           ${name}-${version}${extract.suffix} \
-                    ${name}-generic-unix-${version}${extract.suffix}
+use_xz              yes
 
-checksums \
-        ${name}-${version}${extract.suffix} \
-                    rmd160  4b89e8ed8d5af2333b93d2ad8276f4f6cf29a40c \
-                    sha256  380c9cab8f24add440a0aead3b70a0830e0f32a531139828003ae18e08b72028 \
-        ${name}-generic-unix-${version}${extract.suffix} \
-                    rmd160  8b4af6925bd4ce97acff82bef9b5304ddad27529 \
-                    sha256  821b6349554a89ef038c56c7b1e0ceb8553645597142b8c3d564b3a8fa371b8b
+distfiles           ${name}-generic-unix-${version}${extract.suffix}
+worksrcdir          [string map {- _} $name]-$version
 
+checksums           rmd160  6133c55ae339c5e0b86895830ec42524530521f1 \
+                    sha256  232d558addf74cb371fc65ca10a7b3a2b6b31951b39baa1610488135d0f8ebf1
 
 depends_lib         port:erlang
-depends_build       port:libxslt \
-                    port:git
-# no code from git is incorporated, so its license doesn't prevent distribution
-set license_noconflict git
+depends_build       port:libxslt
 
 platform darwin 8 {
     depends_build-append port:py26-simplejson
     build.args      PYTHON=${prefix}/bin/python2.6
 }
 
 platform darwin 9 {
     depends_build-append port:py26-simplejson
     build.args      PYTHON=${prefix}/bin/python2.6
 }
+
 # no need for simplejson on Snow Leopard or higher
-
 if {${os.major} > 9 && ${os.platform} eq "darwin"} {
     # python3.X doesn't work
     build.args      PYTHON=python2.7
 }
 
@@ -59 +52 @@
 set serverhome      ${prefix}/var/lib/rabbitmq
 set logdir          ${prefix}/var/log/rabbitmq
 set confdir         ${prefix}/etc/rabbitmq
 set mnesiadbdir     ${prefix}/var/lib/rabbitmq/mnesia
 set plistloc        ${prefix}/etc/LaunchDaemons/org.macports.rabbitmq-server
-set sbindir         ${destroot}${prefix}/lib/rabbitmq/bin
+set rootdest        ${prefix}/lib/rabbitmq
+set rootserver      ${rootdest}/lib/${worksrcdir}
+set sbindir         ${destroot}${rootdest}/bin
 set wrappersbin     ${destroot}${prefix}/sbin
-set realsbin        ${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version}/sbin
-set mansrc          ${workpath}/rabbitmq_server-${version}/share/man
+set realsbin        ${destroot}${rootserver}/sbin
+set mansrc          ${workpath}/${worksrcdir}/share/man
 set mandest         ${destroot}${prefix}/share/man
 
+add_users ${serveruser} group=${servergroup} realname=RabbitMQ\ Server home=${serverhome}
+
 use_configure       no
 
-use_parallel_build  no
-
-build.env-append    HOME=${workpath}
-
-build.env-append    VERSION=${version}
-
-destroot.env-append VERSION=${version}
-
-destroot.target     install_bin
-
-destroot.destdir \
-    TARGET_DIR=${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version} \
-    SBIN_DIR=${sbindir} \
-    MAN_DIR=${destroot}${prefix}/share/man
+build {}
 
 destroot.keepdirs \
     ${destroot}${confdir} \
     ${destroot}${logdir} \
     ${destroot}${mnesiadbdir}
 
-add_users ${serveruser} group=${servergroup} realname=RabbitMQ\ Server home=${serverhome}
-
-post-destroot {
+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}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
+    xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${rootserver}
+    xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}
+    xinstall -d -g [existsgroup ${servergroup}] -m 775 ${sbindir}
+
+    copy {*}[glob ${worksrcpath}/*] ${destroot}${rootserver}/
 
     reinplace -E "s:^SYS_PREFIX=\${RABBITMQ_HOME}$:SYS_PREFIX=${prefix}:" \
         ${realsbin}/rabbitmq-defaults
     reinplace -E "s:^SYS_PREFIX=$:SYS_PREFIX=${prefix}:" \
         ${realsbin}/rabbitmq-defaults
@@ -117 +103 @@
     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
 
-    file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmqctl
-    file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmq-plugins
+    copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmqctl
+    copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmq-plugins
     file attributes ${destroot}${serverhome} -owner ${serveruser} -group ${servergroup}
     file attributes ${destroot}${logdir} -owner ${serveruser} -group ${servergroup}
 
+    foreach script {rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmqctl} {
+        ln -s ../lib/${worksrcdir}/sbin/${script} ${sbindir}/${script}
+    }
+
     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/
 }