Changeset 23568 for trunk/dports/math


Ignore:
Timestamp:
Apr 4, 2007, 8:14:28 PM (13 years ago)
Author:
stechert@…
Message:

committing patch for trac ticket #11661 proxying for moll@…

Location:
trunk/dports/math/arpack
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/arpack/Portfile

    r23224 r23568  
    33name          arpack
    44version       1
     5revision      1
    56categories    math
    67platforms     darwin
     
    2122depends_build port:gcc42
    2223use_configure   no
    23 worksrcdir       ARPACK
    24 patchfiles               patch-arpack.diff
    25 build.args all FC=gfortran-dp-4.2 home=${worksrcpath}
     24worksrcdir      ARPACK
     25patchfiles      patch-arpack.diff
     26build.args      all FC=gfortran-dp-4.2 home=${worksrcpath}
    2627destroot    {
    2728   xinstall -m 644 -v -W ${worksrcpath} libarpack.a ${destroot}${prefix}/lib
  • trunk/dports/math/arpack/files/patch-arpack.diff

    r22025 r23568  
    1 *** ./ARmake.inc        Fri Apr 26 12:12:57 1996
    2 --- ./ARmake.inc        Thu Dec  7 21:01:43 2006
    3 ***************
    4 *** 34,39 ****
    5 --- 34,44 ----
    6   #
    7   PLAT = SUN4
    8   #
    9 + #  The communication library ( need for parallel library only )
    10 + #  Current availible platforms are: BLACS or MPI
    11 + #
    12 + COMMLIB       = MPI
    13 + #
    14   #  %------------------------------------------------------%
    15   #  | The directories to find the various pieces of ARPACK |
    16   #  %------------------------------------------------------%
    17 ***************
    18 *** 42,47 ****
    19 --- 47,54 ----
    20   LAPACKdir    = $(home)/LAPACK
    21   UTILdir      = $(home)/UTIL
    22   SRCdir       = $(home)/SRC
    23 + PSRCdir      = $(home)/PARPACK/SRC/$(COMMLIB)
    24 + PUTILdir     = $(home)/PARPACK/UTIL/$(COMMLIB)
    25   #
    26   DIRS        = $(BLASdir) $(LAPACKdir) $(UTILdir) $(SRCdir)
    27   #
    28 ***************
    29 *** 51,67 ****
    30   # | NOTE: ARPACK assumes the use of LAPACK version 2 codes.           |
    31   # %-------------------------------------------------------------------%
    32   #
    33 ! #DIRS         = $(UTILdir) $(SRCdir)
    34   #
    35   # %---------------------------------------------------%
    36   # | The name of the libraries to be created/linked to |
    37   # %---------------------------------------------------%
    38   #
    39 ! ARPACKLIB  = $(home)/libarpack_$(PLAT).a
    40 ! LAPACKLIB =
    41   BLASLIB =
    42   #
    43   ALIBS =  $(ARPACKLIB) $(LAPACKLIB) $(BLASLIB)
    44   #
    45   #
    46   # %---------------------------------------------------------%
    47 --- 58,78 ----
    48   # | NOTE: ARPACK assumes the use of LAPACK version 2 codes.           |
    49   # %-------------------------------------------------------------------%
    50   #
    51 ! DIRS         = $(UTILdir) $(SRCdir)
    52   #
    53   # %---------------------------------------------------%
    54   # | The name of the libraries to be created/linked to |
    55   # %---------------------------------------------------%
    56   #
    57 ! ARPACKLIB  = $(home)/libarpack.a
    58 ! PARPACKLIB = $(home)/libparpack.a
    59 ! LAPACKLIB = -framework Accelerate
    60   BLASLIB =
    61   #
    62   ALIBS =  $(ARPACKLIB) $(LAPACKLIB) $(BLASLIB)
    63 + MPILIBS =
    64 + PLIBS = $(PARPACKLIB) $(ALIBS) $(MPILIBS)
    65 +
    66   #
    67   #
    68   # %---------------------------------------------------------%
    69 ***************
    70 *** 102,108 ****
    71   # %-----------------------------------------%
    72   #
    73   FC      = f77
    74 ! FFLAGS        = -O -cg89
    75  
    76   LDFLAGS =
    77   CD      = cd
    78 --- 113,119 ----
    79   # %-----------------------------------------%
    80   #
    81   FC      = f77
    82 ! FFLAGS        = -O2 -ff2c -fno-underscoring
    83  
    84   LDFLAGS =
    85   CD      = cd
    86 ***************
    87 *** 112,118 ****
    88   LN      = ln
    89   LNFLAGS = -s
    90  
    91 ! MAKE    = /bin/make
    92  
    93   RM      = rm
    94   RMFLAGS = -f
    95 --- 123,129 ----
    96   LN      = ln
    97   LNFLAGS = -s
    98  
    99 ! MAKE    = make
    100  
    101   RM      = rm
    102   RMFLAGS = -f
    103 *** ./UTIL/second.f       Mon Oct  2 11:56:44 1995
    104 --- ./UTIL/second.f       Fri Dec  8 10:56:45 2006
    105 ***************
    106 *** 20,34 ****
    107         REAL               TARRAY( 2 )
    108   *     ..
    109   *     .. External Functions ..
    110 !       REAL               ETIME
    111 !       EXTERNAL           ETIME
    112   *     ..
    113   *     .. Executable Statements ..
    114   *
    115 
    116 !       T1 = ETIME( TARRAY )
    117 !       T  = TARRAY( 1 )
    118 !
    119         RETURN
    120   *
    121   *     End of SECOND
    122 --- 20,34 ----
    123         REAL               TARRAY( 2 )
    124   *     ..
    125   *     .. External Functions ..
    126 !       REAL               SECOND_
    127 !       EXTERNAL           SECOND_
    128   *     ..
    129   *     .. Executable Statements ..
    130   *
    131 
    132 ! *     T1 = ETIME( TARRAY )
    133 ! *      T  = TARRAY( 1 )
    134 !       T  = SECOND_()
    135         RETURN
    136   *
    137   *     End of SECOND
    138 q
     1--- ./ARmake.inc        2007-03-29 16:08:05.000000000 +0200
     2+++ ./ARmake.inc        2007-03-29 16:08:15.000000000 +0200
     3@@ -34,6 +34,11 @@
     4 #
     5 PLAT = SUN4
     6 #
     7+#  The communication library ( need for parallel library only )
     8+#  Current availible platforms are: BLACS or MPI
     9+#
     10+COMMLIB       = MPI
     11+#
     12 #  %------------------------------------------------------%
     13 #  | The directories to find the various pieces of ARPACK |
     14 #  %------------------------------------------------------%
     15@@ -42,6 +47,8 @@
     16 LAPACKdir    = $(home)/LAPACK
     17 UTILdir      = $(home)/UTIL
     18 SRCdir       = $(home)/SRC
     19+PSRCdir      = $(home)/PARPACK/SRC/$(COMMLIB)
     20+PUTILdir     = $(home)/PARPACK/UTIL/$(COMMLIB)
     21 #
     22 DIRS        = $(BLASdir) $(LAPACKdir) $(UTILdir) $(SRCdir)
     23 #
     24@@ -51,17 +58,21 @@
     25 # | NOTE: ARPACK assumes the use of LAPACK version 2 codes.           |
     26 # %-------------------------------------------------------------------%
     27 #
     28-#DIRS         = $(UTILdir) $(SRCdir)
     29+DIRS         = $(UTILdir) $(SRCdir)
     30 #
     31 # %---------------------------------------------------%
     32 # | The name of the libraries to be created/linked to |
     33 # %---------------------------------------------------%
     34 #
     35-ARPACKLIB  = $(home)/libarpack_$(PLAT).a
     36-LAPACKLIB =
     37+ARPACKLIB  = $(home)/libarpack.a
     38+PARPACKLIB = $(home)/libparpack.a
     39+LAPACKLIB = -framework Accelerate
     40 BLASLIB =
     41 #
     42 ALIBS =  $(ARPACKLIB) $(LAPACKLIB) $(BLASLIB)
     43+MPILIBS =
     44+PLIBS = $(PARPACKLIB) $(ALIBS) $(MPILIBS)
     45+
     46 #
     47 #
     48 # %---------------------------------------------------------%
     49@@ -102,7 +113,7 @@
     50 # %-----------------------------------------%
     51 #
     52 FC      = f77
     53-FFLAGS = -O -cg89
     54+FFLAGS = -O2 -ff2c
     55 
     56 LDFLAGS =
     57 CD      = cd
     58@@ -112,7 +123,7 @@
     59 LN      = ln
     60 LNFLAGS = -s
     61 
     62-MAKE    = /bin/make
     63+MAKE    = make
     64 
     65 RM      = rm
     66 RMFLAGS = -f
     67diff -rubw ARPACK.orig/ARPACK/UTIL/second.f ARPACK/UTIL/second.f
     68--- ./UTIL/second.f     2007-03-29 16:08:05.000000000 +0200
     69+++ ./UTIL/second.f     2007-03-29 16:08:15.000000000 +0200
     70@@ -20,15 +20,15 @@
     71       REAL               TARRAY( 2 )
     72 *     ..
     73 *     .. External Functions ..
     74-      REAL               ETIME
     75-      EXTERNAL           ETIME
     76+*      REAL               ETIME
     77+*      EXTERNAL           ETIME
     78 *     ..
     79 *     .. Executable Statements ..
     80 *
     81 
     82-      T1 = ETIME( TARRAY )
     83-      T  = TARRAY( 1 )
     84-
     85+*     T1 = ETIME( TARRAY )
     86+*      T  = TARRAY( 1 )
     87+      T  = 1
     88       RETURN
     89 *
     90 *     End of SECOND
Note: See TracChangeset for help on using the changeset viewer.