* Installation of mod files.

* make.inc in example dir has been changed for slightly better one.

Spotted by: Anton Shterenlikht <mexas@bristol.ac.uk>

3 files changed, 27 insertions, 10 deletions

diff --git a/math/lapack95/Makefile b/math/lapack95/Makefile
index af38e8fc799e..4312a62eb110 100644
--- a/math/lapack95/Makefile
+++ b/math/lapack95/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lapack95
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/lapack95/
 DISTNAME=	${PORTNAME}
@@ -30,7 +30,7 @@ WITH_ATLAS=	yes
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
 BLAS=		-lf77blas -latlas
-LAPACK=		-lalapack
+LAPACK=		-lalapack -lcblas
 .else
 LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
 LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
@@ -52,12 +52,18 @@ pre-build:
 		 s,%%FORTRAN_FIXED%%,${FORTRAN_FIXED},g ; \
 		 s,%%FORTRAN_FREE%%,${FORTRAN_FREE},g ; \
 		 s,%%FFLAGS%%,${FFLAGS},g ; \
+		 s,%%BLAS%%,${BLAS},g ; \
+		 s,%%LAPACK%%,${LAPACK},g ; \
+		 s,%%PREFIX%%,${PREFIX},g ; \
 		 s,%%LOCALBASE%%,${LOCALBASE},g' \
 		${WRKSRC}/make.inc
 	@${REINPLACE_CMD} -e 's,%%FC%%,${FC},g ; \
 		 s,%%FORTRAN_FIXED%%,${FORTRAN_FIXED},g ; \
 		 s,%%FORTRAN_FREE%%,${FORTRAN_FREE},g ; \
 		 s,%%FFLAGS%%,${FFLAGS} ${PICFLAG},g ; \
+		 s,%%BLAS%%,${BLAS},g ; \
+		 s,%%LAPACK%%,${LAPACK},g ; \
+		 s,%%PREFIX%%,${PREFIX},g ; \
 		 s,%%LOCALBASE%%,${LOCALBASE},g' \
 		${WRKSRC}_SHARED/make.inc
 do-build:
@@ -69,6 +75,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}_SHARED/liblapack95.so.1 ${PREFIX}/lib
 	${LN} -sf liblapack95.so.1 ${PREFIX}/lib/liblapack95.so
 
+	${MKDIR} ${PREFIX}/lib/lapack95_modules
+	${INSTALL_DATA} ${WRKSRC}_SHARED/lapack95_modules/*.mod ${PREFIX}/lib/lapack95_modules
 	@${MKDIR} ${EXAMPLESDIR}
 	@${MKDIR} ${EXAMPLESDIR}/EXAMPLES1
 	@${MKDIR} ${EXAMPLESDIR}/EXAMPLES2
diff --git a/math/lapack95/files/patch-make.inc b/math/lapack95/files/patch-make.inc
index e97b0712696a..7fcdc32169b9 100644
--- a/math/lapack95/files/patch-make.inc
+++ b/math/lapack95/files/patch-make.inc
@@ -1,5 +1,5 @@
 --- make.inc.orig	Thu Nov 30 22:18:37 2000
-+++ make.inc	Wed Jan 10 09:31:14 2007
++++ make.inc	Tue Sep  4 17:20:52 2007
 @@ -3,8 +3,8 @@
  #     UNI-C, Denmark; Univ. of Tennessee, USA; NAG Ltd., UK
  #     August 5, 2000
@@ -11,27 +11,32 @@
  # -dcfuns  Enable recognition of non-standard double
  #          precision  complex intrinsic functions
  # -dusty   Allows the compilation and execution of "legacy"
-@@ -13,19 +13,19 @@
+@@ -13,21 +13,21 @@
  # -ieee=full enables all IEEE arithmetic facilities
  #          including non-stop arithmetic.
  
 -OPTS0    = -u -V -dcfuns -dusty -ieee=full
+-MODLIB   = -I./../lapack95_modules
 +OPTS0    = %%FFLAGS%% #-u -V -dcfuns -dusty -ieee=full
- MODLIB   = -I./../lapack95_modules
++MODLIB   = -I./../lapack95_modules -I%%PREFIX%%/lib/lapack95_modules
  OPTS1    = -c $(OPTS0)
  OPTS3    = $(OPTS1) $(MODLIB)
  OPTL     = -o 
  OPTLIB   =
  
 -LAPACK_PATH = /usr/local/lib/LAPACK3/
-+LAPACK_PATH = -L%%LOCALBASE%%/lib
++LAPACK_PATH = -L%%LOCALBASE%%/lib -L%%PREFIX%%/lib
  
- LAPACK95 = ../lapack95.a
+-LAPACK95 = ../lapack95.a
 -LAPACK77 = $(LAPACK_PATH)/lapack.a
-+LAPACK77 = -llapack
++LAPACK95 = -llapack95
++LAPACK77 = %%LAPACK%%
  TMG77    = $(LAPACK_PATH)/tmglib.a
 -BLAS     = $(LAPACK_PATH)/blas.a
-+BLAS     = -lblas
++BLAS     = %%BLAS%%
  
- LIBS     = $(LAPACK95) $(TMG77) $(LAPACK77) $(BLAS)
+-LIBS     = $(LAPACK95) $(TMG77) $(LAPACK77) $(BLAS)
++LIBS     = $(LAPACK_PATH) $(LAPACK95) $(LAPACK77) $(BLAS)
  SUF      = f90
+ 
+ XX = 'rm' -f $@; \
diff --git a/math/lapack95/pkg-plist b/math/lapack95/pkg-plist
index a8055e472465..e0f3951883d6 100644
--- a/math/lapack95/pkg-plist
+++ b/math/lapack95/pkg-plist
@@ -1,6 +1,10 @@
 lib/liblapack95.a
 lib/liblapack95.so
 lib/liblapack95.so.1
+lib/lapack95_modules/f77_lapack.mod
+lib/lapack95_modules/f95_lapack.mod
+lib/lapack95_modules/la_auxmod.mod
+lib/lapack95_modules/la_precision.mod
 %%EXAMPLESDIR%%/make.inc
 %%EXAMPLESDIR%%/EXAMPLES1/gbsv.ma
 %%EXAMPLESDIR%%/EXAMPLES1/la_gesv_example.f90