update after blas update, a rerolled distfile, and also use gfortran.

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/cblas/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- Makefile    16 Mar 2015 18:07:49 -0000      1.16
+++ Makefile    4 Nov 2017 16:10:18 -0000
@@ -5,7 +5,7 @@ COMMENT=        C interface to the BLAS library
 VERSION=       1.0
 DISTNAME=      cblas
 PKGNAME=       ${DISTNAME}-${VERSION}
-REVISION=      3
+REVISION=      4
 SHARED_LIBS=   cblas   1.0
 
 CATEGORIES=    math
@@ -24,24 +24,27 @@ WRKDIST=    ${WRKDIR}/CBLAS
 WRKSRC=                ${WRKDIST}/src
 
 MODULES=               fortran
-MODFORTRAN_COMPILER =  g77
+MODFORTRAN_COMPILER =  gfortran
 
 BUILD_DEPENDS =        ${MODFORTRAN_BUILD_DEPENDS}
 LIB_DEPENDS =  math/blas
-WANTLIB =      blas>=1.0
+WANTLIB =      blas>=2.1
 
-CFLAGS+=       -DADD_
+CFLAGS+=       -DADD_ -I${WRKDIST}/include
 MAKE_FILE=     ${FILESDIR}/Makefile
 MAKE_ENV=      SHLIB_MAJOR=${LIBcblas_VERSION:R} \
                SHLIB_MINOR=${LIBcblas_VERSION:E} \
-               FC=${FC}
-FAKE_FLAGS=    LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
-
-TEST_FLAGS=    LOADER=${FC} CFLAGS="${CFLAGS}" INC="-I${WRKSRC}" \
-               LIB="-L${WRKSRC} -lcblas -L${LOCALBASE}/lib -lblas"
+               FC="${MODFORTRAN_COMPILER} -cpp"
+FAKE_FLAGS=    LIBDIR=${LOCALBASE}/lib \
+               DEBUGLIBS=no
+
+TEST_FLAGS=    LOADER=${MODFORTRAN_COMPILER} \
+               CFLAGS="${CFLAGS}" \
+               INC="-I${WRKSRC}" \
+               LIB="-L${WRKSRC} -lcblas -L${LOCALBASE}/lib -lblas -lgfortran"
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include
+       ${INSTALL_DATA} ${WRKDIST}/include/*.h ${PREFIX}/include
 
 do-test:
        @cd ${WRKDIST}/testing && \
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/cblas/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo    18 Jan 2015 03:14:26 -0000      1.3
+++ distinfo    4 Nov 2017 16:10:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (cblas-1.0/cblas.tgz) = m0nXF3/aYrYUG/LKKeR16G8LEtj3LguUQFjQK0Od1So=
-SIZE (cblas-1.0/cblas.tgz) = 197694
+SHA256 (cblas-1.0/cblas.tgz) = D2NU/Wf6vZCbr1fO0u+E6WLbWPrhJuT0GyHdT+xgoqM=
+SIZE (cblas-1.0/cblas.tgz) = 197468
Index: patches/patch-testing_Makefile
===================================================================
RCS file: /cvs/ports/math/cblas/patches/patch-testing_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-testing_Makefile
--- patches/patch-testing_Makefile      2 Oct 2006 21:58:25 -0000       1.1.1.1
+++ patches/patch-testing_Makefile      4 Nov 2017 16:10:18 -0000
@@ -1,12 +1,13 @@
 $OpenBSD: patch-testing_Makefile,v 1.1.1.1 2006/10/02 21:58:25 steven Exp $
---- testing/Makefile.orig      Sun Oct  1 15:52:32 2006
-+++ testing/Makefile   Sun Oct  1 15:52:39 2006
+Index: testing/Makefile
+--- testing/Makefile.orig
++++ testing/Makefile
 @@ -3,7 +3,7 @@
  #
  
  dlvl = ../.
 -include $(dlvl)/Makefile.in
 +#include $(dlvl)/Makefile.in
- INC = -I$(CBDIR)/src
  
  # Archive files necessary to compile
+ LIB = $(CBLIB) $(BLLIB) 

Reply via email to