[90401] trunk/dports/sysutils/ipmitool

[dports at macports.org]

Revision: 90401
          http://trac.macports.org/changeset/90401
Author:   dports at macports.org
Date:     2012-03-04 12:24:46 -0800 (Sun, 04 Mar 2012)
Log Message:
-----------
ipmitool: fix build with clang (#33466)

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

Added Paths:
-----------
    trunk/dports/sysutils/ipmitool/files/
    trunk/dports/sysutils/ipmitool/files/patch-fix-return-types.diff

Modified: trunk/dports/sysutils/ipmitool/Portfile
===================================================================
--- trunk/dports/sysutils/ipmitool/Portfile	2012-03-04 20:23:51 UTC (rev 90400)
+++ trunk/dports/sysutils/ipmitool/Portfile	2012-03-04 20:24:46 UTC (rev 90401)
@@ -32,4 +32,7 @@
 checksums       sha1    4cb6ff3736fd3e166abc5303d6373672327a5db1 \
                 rmd160  189b2232bcd148bc89c610dfae73c6f12f42fb36
 
+# fix errors with clang
+patchfiles      patch-fix-return-types.diff
+
 configure.args  --mandir=${prefix}/share/man

Added: trunk/dports/sysutils/ipmitool/files/patch-fix-return-types.diff
===================================================================
--- trunk/dports/sysutils/ipmitool/files/patch-fix-return-types.diff	                        (rev 0)
+++ trunk/dports/sysutils/ipmitool/files/patch-fix-return-types.diff	2012-03-04 20:24:46 UTC (rev 90401)
@@ -0,0 +1,42 @@
+--- lib/ipmi_hpmfwupg.c.orig	2012-03-04 15:05:24.000000000 -0500
++++ lib/ipmi_hpmfwupg.c	2012-03-04 15:06:56.000000000 -0500
+@@ -1233,7 +1233,7 @@
+     if (rc != HPMFWUPG_SUCCESS)
+     {
+         lprintf(LOG_NOTICE,"Verify whether the Target board is present \n");
+-        return;
++        return rc;
+     }
+ 
+     rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
+@@ -3516,7 +3516,7 @@
+    if ( (argc == 0) || (strcmp(argv[0], "help") == 0) ) 
+    {
+       HpmfwupgPrintUsage();
+-      return;
++      return HPMFWUPG_SUCCESS;
+     }
+    if ( (strcmp(argv[0], "check") == 0) )
+    {
+--- src/plugins/lan/lan.c.orig	2012-03-04 15:10:45.000000000 -0500
++++ src/plugins/lan/lan.c	2012-03-04 15:11:15.000000000 -0500
+@@ -1071,7 +1071,7 @@
+ 	msg = malloc(len);
+ 	if (msg == NULL) {
+ 		lprintf(LOG_ERR, "ipmitool: malloc failure");
+-		return;
++		return NULL;
+ 	}
+ 	memset(msg, 0, len);
+ 
+--- src/plugins/lanplus/lanplus.c.orig	2012-03-04 15:14:12.000000000 -0500
++++ src/plugins/lanplus/lanplus.c	2012-03-04 15:14:28.000000000 -0500
+@@ -734,7 +734,7 @@
+       				ipmi_req_remove_entry(rsp->payload.ipmi_response.rq_seq,
+ 								rsp->payload.ipmi_response.cmd);
+                   ipmi_lan_poll_recv(intf);
+-                  return;
++                  return NULL;
+ 					}
+ 					else
+ 					{		
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120304/2cb187b5/attachment.html>