pkg/26146: Changes to make parallel/pvm3 build under Darwin

[jbernard%mines.edu@localhost]

>Number:         26146
>Category:       pkg
>Synopsis:       Changes to make parallel/pvm3 build under Darwin
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jul 02 23:15:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jim Bernard
>Release:        pkgsrc as of Fri Jul  2 09:37:43 UTC 2004
>Organization:
>Environment:
System: Mac OS X 10.3.4
Architecture: ppc
Machine: ppc
>Description:
        The pvm package needs a few modifications to get it to build
        under Darwin.

>How-To-Repeat:
        Try it.

>Fix:
        arch.mk: Recognize Darwin and set _PVM_OPSYS and _PVM_ARCH
          appropriately.

        These introduce 4 new patches to the patches directory:

        work/pvm3/conf/DARWIN.def: Incorporate RSHCOMMAND like the
          NetBSD .def files do.  Eliminate FAKEXDRFLOAT (no longer
          needed---this source is pretty old) and the -I flag (also
          no longer needed).  Add flags to eliminate /usr/local/include
          from the system paths searched by cpp (see PR 26143 for
          details; since aimk is used here, the change to sys.mk
          given in that PR is not sufficient to eliminate
          /usr/local/include in this build; but maybe buildlink3
          could be modified to handle it).

        work/pvm3/tracer/{tracer.h,trclib.h,trcsort.c}: Include
          stdlib.h instead of malloc.h if HASSTDLIB.  This is not
          Darwin specific, but I believe it is generally correct.

        And, of course, distinfo must be modified.

        Here are the 5 patches:

--- arch.mk-dist        Thu Mar 20 16:34:36 2003
+++ arch.mk     Tue Jun 29 15:32:41 2004
@@ -24,6 +24,9 @@
 .elif ${OPSYS} == "SunOS"
 _PVM_OPSYS=    SUN4
 _PVM_ARCH=     SOL2    # Solaris (SunOS 5.*)
+.elif ${OPSYS} == "Darwin"
+_PVM_OPSYS=    DARWIN
+_PVM_ARCH=     # empty
 .else
 _PVM_OPSYS=    UNKNOWN
 _PVM_ARCH=     # empty
--- conf/DARWIN.def.orig        Thu Sep 27 13:56:33 2001
+++ conf/DARWIN.def     Fri Jul  2 16:33:29 2004
@@ -1,9 +1,8 @@
 ARCHCFLAGS     =       -DSOCKADHASLEN -DNOREXEC \
-       -DRSHCOMMAND=\"/usr/bin/rsh\" \
+       -DRSHCOMMAND=\"${SSH}\" \
        -DHASSTDLIB -DNEEDMENDIAN -DHASERRORVARS \
-       -DFAKEXDRFLOAT -DSYSERRISCONST \
-       -I/System/Library/Frameworks/System.framework/Headers/bsd/sys
-       # this last -I flag needed for tracer build...
+       -DSYSERRISCONST \
+       -nostdinc -isystem /usr/include/gcc/darwin/default -isystem /usr/include
 ARCHDLIB       =
 ARCHDOBJ       =
 ARCHLIB                =       
--- tracer/tracer.h.orig        Fri May 11 15:19:43 2001
+++ tracer/tracer.h     Tue Jun 29 14:23:21 2004
@@ -40,8 +40,12 @@
 #include "pvmwin.h"
 #include <time.h>
 #endif
+#ifdef HASSTDLIB
+#include <stdlib.h>
+#else
 #ifndef IMA_MACOSX
 #include <malloc.h>
+#endif
 #endif
 #include <signal.h>
 #include <ctype.h>
--- tracer/trclib.h.orig        Fri May 11 15:19:43 2001
+++ tracer/trclib.h     Tue Jun 29 14:31:42 2004
@@ -34,8 +34,12 @@
 #include "pvmwin.h"
 #endif
 #include <time.h>
+#ifdef HASSTDLIB
+#include <stdlib.h>
+#else
 #ifndef IMA_MACOSX
 #include <malloc.h>
+#endif
 #endif
 
 
--- tracer/trcsort.c.orig       Fri May 11 15:19:44 2001
+++ tracer/trcsort.c    Tue Jun 29 14:41:00 2004
@@ -31,8 +31,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#ifdef HASSTDLIB
+#include <stdlib.h>
+#else
 #ifndef IMA_MACOSX
 #include <malloc.h>
+#endif
 #endif
 
 #ifdef  SYSVSTR
>Release-Note:
>Audit-Trail:
>Unformatted: