Revision

81682

Author

ryandesign@macports.org

Date

2011-08-04 03:11:47 -0700 (Thu, 04 Aug 2011)

Log Message

xmgr: fix segfault on lion; see #30551

Modified Paths

• trunk/dports/math/xmgr/Portfile
• trunk/dports/math/xmgr/files/patch-motifutils.c

Diff

--- trunk/dports/math/xmgr/Portfile	2011-08-04 10:10:29 UTC (rev 81681)
+++ trunk/dports/math/xmgr/Portfile	2011-08-04 10:11:47 UTC (rev 81682)
@@ -4,7 +4,7 @@
 
 name                xmgr
 version             4.1.2
-revision            1
+revision            2
 categories          math science
 maintainers         mac.com:mlund
 description         ACE/gr 2D plotting tool (Ancestor to Grace)

--- trunk/dports/math/xmgr/files/patch-motifutils.c	2011-08-04 10:10:29 UTC (rev 81681)
+++ trunk/dports/math/xmgr/files/patch-motifutils.c	2011-08-04 10:11:47 UTC (rev 81682)
@@ -1,5 +1,5 @@
---- src/motifutils.c.orig	2011-01-30 19:39:41.000000000 +0100
-+++ src/motifutils.c	2011-04-29 14:00:06.000000000 +0200
+--- src/motifutils.c.orig	2011-08-04 11:11:51.000000000 +0200
++++ src/motifutils.c	2011-08-04 10:57:01.000000000 +0200
 @@ -121,7 +121,7 @@
  
      i = 0;
@@ -18,3 +18,12 @@
  	retval[i + 2] = XmCreatePushButton(retval[1], s, NULL, 0);
  	i++;
      }
+@@ -1294,7 +1294,7 @@
+     	XmNlabelString, str, 
+     	XmNmnemonic, mnemonic,
+     	XmNsubMenuId, menu, 
+-    	0);
++    	(char *)NULL);
+     XmStringFree(str);
+     if (help_anchor) {
+      	XtAddCallback(menu, XmNhelpCallback, (XtCallbackProc) HelpCB,