[112816] trunk/dports/sysutils/libvirt

[ryandesign at macports.org]

Revision: 112816
          https://trac.macports.org/changeset/112816
Author:   ryandesign at macports.org
Date:     2013-11-01 15:52:16 -0700 (Fri, 01 Nov 2013)
Log Message:
-----------
libvirt: update to 1.1.3 and fix build failure on Mavericks (#41035); disable silent build rules; use configure.args-replace and configure.python where applicable; add myself as maintainer

Modified Paths:
--------------
    trunk/dports/sysutils/libvirt/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/libvirt/files/
    trunk/dports/sysutils/libvirt/files/patch-src-rpc-virnetmessage.c.diff

Modified: trunk/dports/sysutils/libvirt/Portfile
===================================================================
--- trunk/dports/sysutils/libvirt/Portfile	2013-11-01 22:00:34 UTC (rev 112815)
+++ trunk/dports/sysutils/libvirt/Portfile	2013-11-01 22:52:16 UTC (rev 112816)
@@ -4,12 +4,11 @@
 PortSystem          1.0
 
 name                libvirt
-version             1.0.3
-revision            2
+version             1.1.3
 categories          sysutils
 license             LGPL-2.1+
 platforms           darwin
-maintainers         nomaintainer
+maintainers         ryandesign openmaintainer
 
 description         Libvirt - The Virtualization API
 
@@ -19,8 +18,8 @@
 homepage            http://www.libvirt.org/
 master_sites        ${homepage}sources/
 
-checksums           rmd160  645705d59260733b0afe2de8054748d866c65dcf \
-                    sha256  f64f4acd7cdcfc6ab5e803195ed58b949f262b54e3659d8c37b33f0fec112757
+checksums           rmd160  20cf8ad792a55afa9398403b9c93cb654cc847ca \
+                    sha256  af83e65b4b26520662ddd183c1358be0d05138dba3e66745419f06441eff5a7c
 
 depends_build       port:pkgconfig \
                     port:xhtml1
@@ -36,7 +35,10 @@
                     port:yajl \
                     port:zlib
 
-configure.args      --without-apparmor \
+patchfiles          patch-src-rpc-virnetmessage.c.diff
+
+configure.args      --disable-silent-rules \
+                    --without-apparmor \
                     --without-audit \
                     --without-avahi \
                     --without-capng \
@@ -73,46 +75,40 @@
 
 variant avahi description {Use Avahi to advertise remote daemon} {
     depends_lib-append      port:avahi
-    configure.args-delete   --without-avahi
-    configure.args-append   --with-avahi
+    configure.args-replace  --without-avahi --with-avahi
 }
 
 variant python24 conflicts python25 python26 python27 \
                  description {Compile Python 2.4 bindings} {
     depends_lib-append      port:python24
-    configure.args-delete   --without-python
-    configure.args-append   --with-python
-    configure.env-append    PYTHON=${prefix}/bin/python2.4
+    configure.args-replace  --without-python --with-python
+    configure.python        ${prefix}/bin/python2.4
 }
 
 variant python25 conflicts python24 python26 python27 \
                  description {Compile Python 2.5 bindings} {
     depends_lib-append      port:python25
-    configure.args-delete   --without-python
-    configure.args-append   --with-python
-    configure.env-append    PYTHON=${prefix}/bin/python2.5
+    configure.args-replace  --without-python --with-python
+    configure.python        ${prefix}/bin/python2.5
 }
 
 variant python26 conflicts python24 python25 python27 \
                  description {Compile Python 2.6 bindings} {
     depends_lib-append      port:python26
-    configure.args-delete   --without-python
-    configure.args-append   --with-python
-    configure.env-append    PYTHON=${prefix}/bin/python2.6
+    configure.args-replace  --without-python --with-python
+    configure.python        ${prefix}/bin/python2.6
 }
 
 variant python27 conflicts python24 python25 python26 \
                  description {Compile Python 2.7 bindings} {
     depends_lib-append      port:python27
-    configure.args-delete   --without-python
-    configure.args-append   --with-python
-    configure.env-append    PYTHON=${prefix}/bin/python2.7
+    configure.args-replace  --without-python --with-python
+    configure.python        ${prefix}/bin/python2.7
 }
 
 variant sasl description {Use Cyrus SASL for authentication} {
     depends_lib-append      port:cyrus-sasl2
-    configure.args-delete   --without-sasl
-    configure.args-append   --with-sasl
+    configure.args-replace  --without-sasl --with-sasl
 }
 
 livecheck.type      regex

Added: trunk/dports/sysutils/libvirt/files/patch-src-rpc-virnetmessage.c.diff
===================================================================
--- trunk/dports/sysutils/libvirt/files/patch-src-rpc-virnetmessage.c.diff	                        (rev 0)
+++ trunk/dports/sysutils/libvirt/files/patch-src-rpc-virnetmessage.c.diff	2013-11-01 22:52:16 UTC (rev 112816)
@@ -0,0 +1,22 @@
+Fix build on Mavericks
+https://bugzilla.redhat.com/show_bug.cgi?id=1023860
+--- src/rpc/virnetmessage.c.orig	2013-07-12 07:03:59.000000000 -0500
++++ src/rpc/virnetmessage.c	2013-11-01 17:39:22.000000000 -0500
+@@ -345,7 +345,7 @@
+                   msg->bufferLength - msg->bufferOffset, XDR_ENCODE);
+ 
+     /* Try to encode the payload. If the buffer is too small increase it. */
+-    while (!(*filter)(&xdr, data)) {
++    while (!(*filter)(&xdr, data, 0)) {
+         if ((msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4 > VIR_NET_MESSAGE_MAX) {
+             virReportError(VIR_ERR_RPC, "%s", _("Unable to encode message payload"));
+             goto error;
+@@ -401,7 +401,7 @@
+     xdrmem_create(&xdr, msg->buffer + msg->bufferOffset,
+                   msg->bufferLength - msg->bufferOffset, XDR_DECODE);
+ 
+-    if (!(*filter)(&xdr, data)) {
++    if (!(*filter)(&xdr, data, 0)) {
+         virReportError(VIR_ERR_RPC, "%s", _("Unable to decode message payload"));
+         goto error;
+     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131101/960aba5f/attachment-0001.html>