Ticket #15827: pgplot-files.diff

File pgplot-files.diff, 21.7 KB (added by numaryu, 16 years ago)
  • patch-drivers.list_x11

    diff -urN files.orig/patch-drivers.list_x11 files/patch-drivers.list_x11
    old new  
     1--- drivers.list.orig   Mon May  3 23:02:15 1999
     2+++ drivers.list        Tue Sep 14 14:39:39 2004
     3@@ -67,9 +67,9 @@
     4 ! WDDRIV 1 /WD        X Window dump file, landscape
     5 ! WDDRIV 2 /VWD       X Window dump file, portrait
     6 ! WSDRIV 0 /WS        VAX workstations running VWS software            VMS
     7-! X2DRIV 0 /XDISP     PGDISP or FIGDISP server for X workstations      C
     8-! XWDRIV 1 /XWINDOW   Workstations running X Window System             C
     9-! XWDRIV 2 /XSERVE    Persistent window on X Window System             C
     10+X2DRIV 0 /XDISP     PGDISP or FIGDISP server for X workstations        C
     11+XWDRIV 1 /XWINDOW   Workstations running X Window System               C
     12+XWDRIV 2 /XSERVE    Persistent window on X Window System               C
     13 ! ZEDRIV 0 /ZETA      Zeta 8 Digital Plotter
     14 !
     15 ! The following drivers can only be used in PGPLOT installations on MS-DOS
  • patch-drivers_x11.list

    diff -urN files.orig/patch-drivers_x11.list files/patch-drivers_x11.list
    old new  
    1 --- drivers.list.orig   Mon May  3 23:02:15 1999
    2 +++ drivers.list        Tue Sep 14 14:39:39 2004
    3 @@ -67,9 +67,9 @@
    4  ! WDDRIV 1 /WD        X Window dump file, landscape
    5  ! WDDRIV 2 /VWD       X Window dump file, portrait
    6  ! WSDRIV 0 /WS        VAX workstations running VWS software            VMS
    7 -! X2DRIV 0 /XDISP     PGDISP or FIGDISP server for X workstations      C
    8 -! XWDRIV 1 /XWINDOW   Workstations running X Window System             C
    9 -! XWDRIV 2 /XSERVE    Persistent window on X Window System             C
    10 +X2DRIV 0 /XDISP     PGDISP or FIGDISP server for X workstations        C
    11 +XWDRIV 1 /XWINDOW   Workstations running X Window System               C
    12 +XWDRIV 2 /XSERVE    Persistent window on X Window System               C
    13  ! ZEDRIV 0 /ZETA      Zeta 8 Digital Plotter
    14  !
    15  ! The following drivers can only be used in PGPLOT installations on MS-DOS
  • patch-local.conf

    diff -urN files.orig/patch-local.conf files/patch-local.conf
    old new  
     1*** local.conf.orig     2008-07-02 12:46:47.000000000 -0400
     2--- local.conf  2008-07-02 12:47:18.000000000 -0400
     3***************
     4*** 0 ****
     5--- 1,143 ----
     6+ # The MacPorts build on Darwin.
     7+ #-----------------------------------------------------------------------
     8+
     9+ # Optional: Needed by XWDRIV (/xwindow and /xserve) and
     10+ #           X2DRIV (/xdisp and /figdisp).
     11+ # The arguments needed by the C compiler to locate X-window include files.
     12
     13+    XINCL="-I@@X11PREFIX@@/include"
     14+
     15+ # Optional: Needed by XMDRIV (/xmotif).
     16+ # The arguments needed by the C compiler to locate Motif, Xt and
     17+ # X-window include files.
     18
     19+    MOTIF_INCL=""
     20+
     21+ # Optional: Needed by XADRIV (/xathena).
     22+ # The arguments needed by the C compiler to locate Xaw, Xt and
     23+ # X-window include files.
     24
     25+    ATHENA_INCL=""
     26+
     27+ # Optional: Needed by TKDRIV (/xtk).
     28+ # The arguments needed by the C compiler to locate Tcl, Tk and
     29+ # X-window include files.
     30
     31+    TK_INCL=""
     32+
     33+ # Optional: Needed by RVDRIV (/xrv).
     34+ # The arguments needed by the C compiler to locate Rivet, Tcl, Tk and
     35+ # X-window include files.
     36
     37+    RV_INCL=""
     38+
     39+ # Mandatory.
     40+ # The FORTRAN compiler to use.
     41
     42+    FCOMPL="@@FCOMPL@@"
     43+
     44+ # Mandatory.
     45+ # The FORTRAN compiler flags to use when compiling the pgplot library.
     46+ # (NB. makemake prepends -c to $FFLAGC where needed)
     47
     48+    FFLAGC="@@FC_OPT@@ -I@@PREFIX@@/include @@AQTINC@@"
     49+
     50+ # Mandatory.
     51+ # The FORTRAN compiler flags to use when compiling fortran demo programs.
     52+ # This may need to include a flag to tell the compiler not to treat
     53+ # backslash characters as C-style escape sequences
     54
     55+    FFLAGD="@@FD_OPT@@"
     56+
     57+ # Mandatory.
     58+ # The C compiler to use.
     59
     60+    CCOMPL="@@CCOMPL@@"
     61+
     62+ # Mandatory.
     63+ # The C compiler flags to use when compiling the pgplot library.
     64
     65+    CFLAGC="@@CC_OPT@@ -I@@PREFIX@@/include @@AQTINC@@"
     66+
     67+ # Mandatory.
     68+ # The C compiler flags to use when compiling C demo programs.
     69
     70+    CFLAGD="@@CD_OPT@@"
     71+
     72+ # Optional: Only needed if the cpgplot library is to be compiled.
     73+ # The flags to use when running pgbind to create the C pgplot wrapper
     74+ # library. (See pgplot/cpg/pgbind.usage)
     75
     76+    PGBIND_FLAGS="bsd"
     77+
     78+ # Mandatory.
     79+ # The library-specification flags to use when linking normal pgplot
     80+ # demo programs.
     81
     82+    LIBS="-L@@PREFIX@@/lib @@XLIB@@ @@AQTLIB@@"
     83+
     84+ # Optional: Needed by XMDRIV (/xmotif).
     85+ # The library-specification flags to use when linking motif
     86+ # demo programs.
     87
     88+    MOTIF_LIBS=""
     89+
     90+ # Optional: Needed by XADRIV (/xathena).
     91+ # The library-specification flags to use when linking athena
     92+ # demo programs.
     93
     94+    ATHENA_LIBS=""
     95+
     96+ # Optional: Needed by TKDRIV (/xtk).
     97+ # The library-specification flags to use when linking Tk demo programs.
     98+ # Note that you may need to append version numbers to -ltk and -ltcl.
     99
     100+    TK_LIBS=""
     101+
     102+ # Mandatory.
     103+ # On systems that have a ranlib utility, put "ranlib" here. On other
     104+ # systems put ":" here (Colon is the Bourne-shell do-nothing command).
     105
     106+    RANLIB="ranlib"
     107+
     108+ # Optional: Needed on systems that support shared libraries.
     109+ # The name to give the shared pgplot library.
     110
     111+    SHARED_LIB="@@SHARED_LIB@@"
     112+
     113+ # Optional: Needed if SHARED_LIB is set.
     114+ # How to create a shared library from a trailing list of object files.
     115
     116+    SHARED_LD="@@SHARED_LD@@"
     117+
     118+ # Optional:
     119+ # On systems such as Solaris 2.x, that allow specification of the
     120+ # libraries that a shared library needs to be linked with when a
     121+ # program that uses it is run, this variable should contain the
     122+ # library-specification flags used to specify these libraries to
     123+ # $SHARED_LD
     124
     125+    SHARED_LIB_LIBS="@@SHARED_LIB_LIBS@@"
     126+
     127+ # Optional:
     128+ # Compiler name used on Next systems to compile objective-C files.
     129
     130+    MCOMPL="@@MCOMPL@@"
     131+
     132+ # Optional:
     133+ # Compiler flags used with MCOMPL when compiling objective-C files.
     134
     135+    MFLAGC="@@MC_OPT@@"
     136+
     137+ # Optional: (Actually mandatory, but already defined by makemake).
     138+ # Where to look for any system-specific versions of the files in
     139+ # pgplot/sys. Before evaluating this script, makemake sets SYSDIR to
     140+ # /wherever/pgplot/sys_$OS, where $OS is the operating-system name
     141+ # given by the second command-line argument of makemake. If the
     142+ # present configuration is one of many for this OS, and it needs
     143+ # different modifications to files in pgplot/sys than the other
     144+ # configurations, then you should create a subdirectory of SYSDIR,
     145+ # place the modified files in it and change the following line to
     146+ # $SYSDIR="$SYSDIR/subdirectory_name".
     147
     148+    SYSDIR="$SYSDIR"
  • patch-sys_darwin_g77_gcc.conf

    diff -urN files.orig/patch-sys_darwin_g77_gcc.conf files/patch-sys_darwin_g77_gcc.conf
    old new  
    1 --- ../sys_darwin/g77_gcc.conf.orig     Wed Dec 31 17:00:00 1969
    2 +++ ../sys_darwin/g77_gcc.conf  Mon May 17 17:25:36 2004
    3 @@ -0,0 +1,143 @@
    4 +# The GNU g77 FORTRAN compiler and Gnu gcc C compiler on Darwin.
    5 +#-----------------------------------------------------------------------
    6 +
    7 +# Optional: Needed by XWDRIV (/xwindow and /xserve) and
    8 +#           X2DRIV (/xdisp and /figdisp).
    9 +# The arguments needed by the C compiler to locate X-window include files.
    10 +
    11 +   XINCL="-I@@X11PREFIX@@/include"
    12 +
    13 +# Optional: Needed by XMDRIV (/xmotif).
    14 +# The arguments needed by the C compiler to locate Motif, Xt and
    15 +# X-window include files.
    16 +
    17 +   MOTIF_INCL=""
    18 +
    19 +# Optional: Needed by XADRIV (/xathena).
    20 +# The arguments needed by the C compiler to locate Xaw, Xt and
    21 +# X-window include files.
    22 +
    23 +   ATHENA_INCL=""
    24 +
    25 +# Optional: Needed by TKDRIV (/xtk).
    26 +# The arguments needed by the C compiler to locate Tcl, Tk and
    27 +# X-window include files.
    28 +
    29 +   TK_INCL=""
    30 +
    31 +# Optional: Needed by RVDRIV (/xrv).
    32 +# The arguments needed by the C compiler to locate Rivet, Tcl, Tk and
    33 +# X-window include files.
    34 +
    35 +   RV_INCL=""
    36 +
    37 +# Mandatory.
    38 +# The FORTRAN compiler to use.
    39 +
    40 +   FCOMPL="g77-dp-3.4"
    41 +
    42 +# Mandatory.
    43 +# The FORTRAN compiler flags to use when compiling the pgplot library.
    44 +# (NB. makemake prepends -c to $FFLAGC where needed)
    45 +
    46 +   FFLAGC="-Wimplicit -Wall -O -I@@PREFIX@@/include"
    47 +
    48 +# Mandatory.
    49 +# The FORTRAN compiler flags to use when compiling fortran demo programs.
    50 +# This may need to include a flag to tell the compiler not to treat
    51 +# backslash characters as C-style escape sequences
    52 +
    53 +   FFLAGD="-fno-backslash $FFLAGC"
    54 +
    55 +# Mandatory.
    56 +# The C compiler to use.
    57 +
    58 +   CCOMPL="gcc"
    59 +
    60 +# Mandatory.
    61 +# The C compiler flags to use when compiling the pgplot library.
    62 +
    63 +   CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include"
    64 +
    65 +# Mandatory.
    66 +# The C compiler flags to use when compiling C demo programs.
    67 +
    68 +   CFLAGD="$CFLAGC"
    69 +
    70 +# Optional: Only needed if the cpgplot library is to be compiled.
    71 +# The flags to use when running pgbind to create the C pgplot wrapper
    72 +# library. (See pgplot/cpg/pgbind.usage)
    73 +
    74 +   PGBIND_FLAGS="bsd"
    75 +
    76 +# Mandatory.
    77 +# The library-specification flags to use when linking normal pgplot
    78 +# demo programs.
    79 +
    80 +   LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11"
    81 +
    82 +# Optional: Needed by XMDRIV (/xmotif).
    83 +# The library-specification flags to use when linking motif
    84 +# demo programs.
    85 +
    86 +   MOTIF_LIBS=""
    87 +
    88 +# Optional: Needed by XADRIV (/xathena).
    89 +# The library-specification flags to use when linking athena
    90 +# demo programs.
    91 +
    92 +   ATHENA_LIBS=""
    93 +
    94 +# Optional: Needed by TKDRIV (/xtk).
    95 +# The library-specification flags to use when linking Tk demo programs.
    96 +# Note that you may need to append version numbers to -ltk and -ltcl.
    97 +
    98 +   TK_LIBS=""
    99 +
    100 +# Mandatory.
    101 +# On systems that have a ranlib utility, put "ranlib" here. On other
    102 +# systems put ":" here (Colon is the Bourne-shell do-nothing command).
    103 +
    104 +   RANLIB="ranlib"
    105 +
    106 +# Optional: Needed on systems that support shared libraries.
    107 +# The name to give the shared pgplot library.
    108 +
    109 +   SHARED_LIB=""
    110 +
    111 +# Optional: Needed if SHARED_LIB is set.
    112 +# How to create a shared library from a trailing list of object files.
    113 +
    114 +   SHARED_LD=""
    115 +
    116 +# Optional:
    117 +# On systems such as Solaris 2.x, that allow specification of the
    118 +# libraries that a shared library needs to be linked with when a
    119 +# program that uses it is run, this variable should contain the
    120 +# library-specification flags used to specify these libraries to
    121 +# $SHARED_LD
    122 +
    123 +   SHARED_LIB_LIBS=""
    124 +
    125 +# Optional:
    126 +# Compiler name used on Next systems to compile objective-C files.
    127 +
    128 +   MCOMPL=""
    129 +
    130 +# Optional:
    131 +# Compiler flags used with MCOMPL when compiling objective-C files.
    132 +
    133 +   MFLAGC=""
    134 +
    135 +# Optional: (Actually mandatory, but already defined by makemake).
    136 +# Where to look for any system-specific versions of the files in
    137 +# pgplot/sys. Before evaluating this script, makemake sets SYSDIR to
    138 +# /wherever/pgplot/sys_$OS, where $OS is the operating-system name
    139 +# given by the second command-line argument of makemake. If the
    140 +# present configuration is one of many for this OS, and it needs
    141 +# different modifications to files in pgplot/sys than the other
    142 +# configurations, then you should create a subdirectory of SYSDIR,
    143 +# place the modified files in it and change the following line to
    144 +# $SYSDIR="$SYSDIR/subdirectory_name".
    145 +
    146 +   SYSDIR="$SYSDIR"
  • patch-sys_darwin_g77_gcc.conf_aqt

    diff -urN files.orig/patch-sys_darwin_g77_gcc.conf_aqt files/patch-sys_darwin_g77_gcc.conf_aqt
    old new  
    1 --- ../sys_darwin/g77_gcc.conf.org      2006-04-19 12:15:45.000000000 -0500
    2 +++ ../sys_darwin/g77_gcc.conf  2006-04-19 12:16:16.000000000 -0500
    3 @@ -40,7 +40,7 @@
    4  # The FORTRAN compiler flags to use when compiling the pgplot library.
    5  # (NB. makemake prepends -c to $FFLAGC where needed)
    6  
    7 -   FFLAGC="-Wimplicit -Wall -O -I@@PREFIX@@/include"
    8 +   FFLAGC="-Wimplicit -Wall -O -I@@PREFIX@@/include -I@@PREFIX@@/include/aquaterm"
    9  
    10  # Mandatory.
    11  # The FORTRAN compiler flags to use when compiling fortran demo programs.
    12 @@ -57,7 +57,7 @@
    13  # Mandatory.
    14  # The C compiler flags to use when compiling the pgplot library.
    15  
    16 -   CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include"
    17 +   CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include -I@@PREFIX@@/include/aquaterm"
    18  
    19  # Mandatory.
    20  # The C compiler flags to use when compiling C demo programs.
    21 @@ -74,7 +74,7 @@
    22  # The library-specification flags to use when linking normal pgplot
    23  # demo programs.
    24  
    25 -   LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11"
    26 +   LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11 -Wl,-framework -Wl,Foundation"
    27  
    28  # Optional: Needed by XMDRIV (/xmotif).
    29  # The library-specification flags to use when linking motif
    30 @@ -103,12 +103,12 @@
    31  # Optional: Needed on systems that support shared libraries.
    32  # The name to give the shared pgplot library.
    33  
    34 -   SHARED_LIB=""
    35 +   SHARED_LIB="libpgplot.dylib"
    36  
    37  # Optional: Needed if SHARED_LIB is set.
    38  # How to create a shared library from a trailing list of object files.
    39  
    40 -   SHARED_LD=""
    41 +   SHARED_LD="gcc -dynamiclib -single_module -o $SHARED_LIB -install_name @@PREFIX@@/lib/$SHARED_LIB"
    42  
    43  # Optional:
    44  # On systems such as Solaris 2.x, that allow specification of the
    45 @@ -117,17 +117,17 @@
    46  # library-specification flags used to specify these libraries to
    47  # $SHARED_LD
    48  
    49 -   SHARED_LIB_LIBS=""
    50 +   SHARED_LIB_LIBS="$LIBS -L@@PREFIX@@/lib/gcc-3.4 -lg2c -lSystem -laquaterm -lpng"
    51  
    52  # Optional:
    53  # Compiler name used on Next systems to compile objective-C files.
    54  
    55 -   MCOMPL=""
    56 +   MCOMPL="gcc"
    57  
    58  # Optional:
    59  # Compiler flags used with MCOMPL when compiling objective-C files.
    60  
    61 -   MFLAGC=""
    62 +   MFLAGC="-no-cpp-precomp -DPG_PPU -O2 -I. -I@@PREFIX@@/include/aquaterm"
    63  
    64  # Optional: (Actually mandatory, but already defined by makemake).
    65  # Where to look for any system-specific versions of the files in
  • patch-sys_darwin_gfortran_gcc_42.conf

    diff -urN files.orig/patch-sys_darwin_gfortran_gcc_42.conf files/patch-sys_darwin_gfortran_gcc_42.conf
    old new  
    1 --- ../sys_darwin/gfortran_gcc_42.conf.orig     Wed Dec 31 17:00:00 1969
    2 +++ ../sys_darwin/gfortran_gcc_42.conf  Mon May 17 17:25:36 2004
    3 @@ -0,0 +1,144 @@
    4 +# The MacPorts build of version 4.2 of the GNU gfortran compiler
    5 +# and GNU gcc C compiler on Darwin.
    6 +#-----------------------------------------------------------------------
    7 +
    8 +# Optional: Needed by XWDRIV (/xwindow and /xserve) and
    9 +#           X2DRIV (/xdisp and /figdisp).
    10 +# The arguments needed by the C compiler to locate X-window include files.
    11 +
    12 +   XINCL="-I@@X11PREFIX@@/include"
    13 +
    14 +# Optional: Needed by XMDRIV (/xmotif).
    15 +# The arguments needed by the C compiler to locate Motif, Xt and
    16 +# X-window include files.
    17 +
    18 +   MOTIF_INCL=""
    19 +
    20 +# Optional: Needed by XADRIV (/xathena).
    21 +# The arguments needed by the C compiler to locate Xaw, Xt and
    22 +# X-window include files.
    23 +
    24 +   ATHENA_INCL=""
    25 +
    26 +# Optional: Needed by TKDRIV (/xtk).
    27 +# The arguments needed by the C compiler to locate Tcl, Tk and
    28 +# X-window include files.
    29 +
    30 +   TK_INCL=""
    31 +
    32 +# Optional: Needed by RVDRIV (/xrv).
    33 +# The arguments needed by the C compiler to locate Rivet, Tcl, Tk and
    34 +# X-window include files.
    35 +
    36 +   RV_INCL=""
    37 +
    38 +# Mandatory.
    39 +# The FORTRAN compiler to use.
    40 +
    41 +   FCOMPL="gfortran-mp-4.2"
    42 +
    43 +# Mandatory.
    44 +# The FORTRAN compiler flags to use when compiling the pgplot library.
    45 +# (NB. makemake prepends -c to $FFLAGC where needed)
    46 +
    47 +   FFLAGC="-Wall -O -I@@PREFIX@@/include"
    48 +
    49 +# Mandatory.
    50 +# The FORTRAN compiler flags to use when compiling fortran demo programs.
    51 +# This may need to include a flag to tell the compiler not to treat
    52 +# backslash characters as C-style escape sequences
    53 +
    54 +   FFLAGD="-fno-backslash $FFLAGC"
    55 +
    56 +# Mandatory.
    57 +# The C compiler to use.
    58 +
    59 +   CCOMPL="gcc-mp-4.2"
    60 +
    61 +# Mandatory.
    62 +# The C compiler flags to use when compiling the pgplot library.
    63 +
    64 +   CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include"
    65 +
    66 +# Mandatory.
    67 +# The C compiler flags to use when compiling C demo programs.
    68 +
    69 +   CFLAGD="$CFLAGC"
    70 +
    71 +# Optional: Only needed if the cpgplot library is to be compiled.
    72 +# The flags to use when running pgbind to create the C pgplot wrapper
    73 +# library. (See pgplot/cpg/pgbind.usage)
    74 +
    75 +   PGBIND_FLAGS="bsd"
    76 +
    77 +# Mandatory.
    78 +# The library-specification flags to use when linking normal pgplot
    79 +# demo programs.
    80 +
    81 +   LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11"
    82 +
    83 +# Optional: Needed by XMDRIV (/xmotif).
    84 +# The library-specification flags to use when linking motif
    85 +# demo programs.
    86 +
    87 +   MOTIF_LIBS=""
    88 +
    89 +# Optional: Needed by XADRIV (/xathena).
    90 +# The library-specification flags to use when linking athena
    91 +# demo programs.
    92 +
    93 +   ATHENA_LIBS=""
    94 +
    95 +# Optional: Needed by TKDRIV (/xtk).
    96 +# The library-specification flags to use when linking Tk demo programs.
    97 +# Note that you may need to append version numbers to -ltk and -ltcl.
    98 +
    99 +   TK_LIBS=""
    100 +
    101 +# Mandatory.
    102 +# On systems that have a ranlib utility, put "ranlib" here. On other
    103 +# systems put ":" here (Colon is the Bourne-shell do-nothing command).
    104 +
    105 +   RANLIB="ranlib"
    106 +
    107 +# Optional: Needed on systems that support shared libraries.
    108 +# The name to give the shared pgplot library.
    109 +
    110 +   SHARED_LIB=""
    111 +
    112 +# Optional: Needed if SHARED_LIB is set.
    113 +# How to create a shared library from a trailing list of object files.
    114 +
    115 +   SHARED_LD=""
    116 +
    117 +# Optional:
    118 +# On systems such as Solaris 2.x, that allow specification of the
    119 +# libraries that a shared library needs to be linked with when a
    120 +# program that uses it is run, this variable should contain the
    121 +# library-specification flags used to specify these libraries to
    122 +# $SHARED_LD
    123 +
    124 +   SHARED_LIB_LIBS=""
    125 +
    126 +# Optional:
    127 +# Compiler name used on Next systems to compile objective-C files.
    128 +
    129 +   MCOMPL=""
    130 +
    131 +# Optional:
    132 +# Compiler flags used with MCOMPL when compiling objective-C files.
    133 +
    134 +   MFLAGC=""
    135 +
    136 +# Optional: (Actually mandatory, but already defined by makemake).
    137 +# Where to look for any system-specific versions of the files in
    138 +# pgplot/sys. Before evaluating this script, makemake sets SYSDIR to
    139 +# /wherever/pgplot/sys_$OS, where $OS is the operating-system name
    140 +# given by the second command-line argument of makemake. If the
    141 +# present configuration is one of many for this OS, and it needs
    142 +# different modifications to files in pgplot/sys than the other
    143 +# configurations, then you should create a subdirectory of SYSDIR,
    144 +# place the modified files in it and change the following line to
    145 +# $SYSDIR="$SYSDIR/subdirectory_name".
    146 +
    147 +   SYSDIR="$SYSDIR"
  • patch-sys_darwin_gfortran_gcc_42.conf_aqt

    diff -urN files.orig/patch-sys_darwin_gfortran_gcc_42.conf_aqt files/patch-sys_darwin_gfortran_gcc_42.conf_aqt
    old new  
    1 --- ../sys_darwin/gfortran_gcc_42.conf.org      2006-04-19 12:15:45.000000000 -0500
    2 +++ ../sys_darwin/gfortran_gcc_42.conf  2006-04-19 12:16:16.000000000 -0500
    3 @@ -41,7 +41,7 @@
    4  # The FORTRAN compiler flags to use when compiling the pgplot library.
    5  # (NB. makemake prepends -c to $FFLAGC where needed)
    6  
    7 -   FFLAGC="-Wall -O -I@@PREFIX@@/include"
    8 +   FFLAGC="-Wall -O -I@@PREFIX@@/include -I@@PREFIX@@/include/aquaterm"
    9  
    10  # Mandatory.
    11  # The FORTRAN compiler flags to use when compiling fortran demo programs.
    12 @@ -58,7 +58,7 @@
    13  # Mandatory.
    14  # The C compiler flags to use when compiling the pgplot library.
    15  
    16 -   CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include"
    17 +   CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include -I@@PREFIX@@/include/aquaterm"
    18  
    19  # Mandatory.
    20  # The C compiler flags to use when compiling C demo programs.
    21 @@ -75,7 +75,7 @@
    22  # The library-specification flags to use when linking normal pgplot
    23  # demo programs.
    24  
    25 -   LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11"
    26 +   LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11 -Wl,-framework -Wl,Foundation"
    27  
    28  # Optional: Needed by XMDRIV (/xmotif).
    29  # The library-specification flags to use when linking motif
    30 @@ -104,12 +104,12 @@
    31  # Optional: Needed on systems that support shared libraries.
    32  # The name to give the shared pgplot library.
    33  
    34 -   SHARED_LIB=""
    35 +   SHARED_LIB="libpgplot.dylib"
    36  
    37  # Optional: Needed if SHARED_LIB is set.
    38  # How to create a shared library from a trailing list of object files.
    39  
    40 -   SHARED_LD=""
    41 +   SHARED_LD="gcc-mp-4.2 -dynamiclib -single_module -o $SHARED_LIB -install_name @@PREFIX@@/lib/$SHARED_LIB"
    42  
    43  # Optional:
    44  # On systems such as Solaris 2.x, that allow specification of the
    45 @@ -118,17 +118,17 @@
    46  # library-specification flags used to specify these libraries to
    47  # $SHARED_LD
    48  
    49 -   SHARED_LIB_LIBS=""
    50 +   SHARED_LIB_LIBS="$LIBS -lgfortran -lSystem -laquaterm -lpng"
    51  
    52  # Optional:
    53  # Compiler name used on Next systems to compile objective-C files.
    54  
    55 -   MCOMPL=""
    56 +   MCOMPL="gcc-mp-4.2"
    57  
    58  # Optional:
    59  # Compiler flags used with MCOMPL when compiling objective-C files.
    60  
    61 -   MFLAGC=""
    62 +   MFLAGC="-no-cpp-precomp -DPG_PPU -O2 -I. -I@@PREFIX@@/include/aquaterm"
    63  
    64  # Optional: (Actually mandatory, but already defined by makemake).
    65  # Where to look for any system-specific versions of the files in