Index: head/math/superlu/Makefile =================================================================== --- head/math/superlu/Makefile (revision 293262) +++ head/math/superlu/Makefile (revision 293263) @@ -1,81 +1,86 @@ # New ports collection makefile for: SuperLU # Date created: 31 Oct 97 # Whom: Pedro Giffuni # # $FreeBSD$ # PORTNAME= superlu -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSION= ${P_VERSION}.20060201 CATEGORIES= math MASTER_SITES= http://crd.lbl.gov/~xiaoye/SuperLU/ \ http://crd.lbl.gov/~xiaoye/:doc DISTNAME= ${PORTNAME}_${P_VERSION} .ifndef NOPORTDOCS DISTFILES= ${DISTNAME}${EXTRACT_SUFX} superlu_ug.pdf SLU_general.ps.gz:doc simax95.ps.gz:doc .endif DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= maho@FreeBSD.org COMMENT= A library of routines for performing sparse factorization .include .if exists(${LOCALBASE}/lib/libgoto2.so) WITH_BLAS?= gotoblas .elif exists(${LOCALBASE}/lib/libatlas.so) WITH_BLAS?= atlas .else WITH_BLAS?= reference .endif . if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas BLAS= -lblas .elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p .elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas BLAS= -lptf77blas .endif USE_FORTRAN= yes +USE_LDCONFIG= yes P_VERSION= 3.0 WRKSRC= ${WRKDIR}/SuperLU_${P_VERSION} ALL_TARGET= lib ARCH2FIX= SRC/Makefile TESTING/MATGEN/Makefile CBLAS/Makefile make.inc \ MAKE_INC/make.alpha MAKE_INC/make.inc pre-build: @${REINPLACE_CMD} -e 's+%%BLAS%%+-L${LOCALBASE}/lib ${BLAS}+ ; \ s+%%CC%%+${CC}+; s+%%FC%%+${FC}+; \ s+%%CFLAGS%%+${CFLAGS}+; \ s+%%FFLAGS%%+${FFLAGS}+' \ ${WRKSRC}/make.inc .for fmk in ${ARCH2FIX} @${REINPLACE_CMD} -e 's|^ARCH *.= ar|ARCMD = ar| ; \ s|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${fmk} .endfor do-install: ${INSTALL_DATA} ${WRKSRC}/libsuperlu_${P_VERSION}.a \ ${PREFIX}/lib/libsuperlu.a + ${INSTALL_DATA} ${WRKSRC}/libsuperlu_${P_VERSION}.so \ + ${PREFIX}/lib/libsuperlu.so.${PORTREVISION} + ${LN} -s ${PREFIX}/lib/libsuperlu.so.${PORTREVISION} \ + ${PREFIX}/lib/libsuperlu.so @${MKDIR} ${PREFIX}/include/superlu ${INSTALL_DATA} ${WRKSRC}/SRC/*.h ${PREFIX}/include/superlu .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/SLU_general.ps.gz ${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/simax95.ps.gz ${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/superlu_ug.pdf ${DOCSDIR} .endif regression-test: build @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} testing ) @(cd ${WRKSRC}/TESTING && ${CAT} *.out ) .include Property changes on: head/math/superlu/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.42 \ No newline at end of property +1.43 \ No newline at end of property Index: head/math/superlu/files/patch-make.inc =================================================================== --- head/math/superlu/files/patch-make.inc (revision 293262) +++ head/math/superlu/files/patch-make.inc (revision 293263) @@ -1,30 +1,34 @@ ---- make.inc.orig 2006-01-01 18:52:00.000000000 -0500 -+++ make.inc 2008-06-19 22:08:49.000000000 -0500 -@@ -19,7 +19,7 @@ +--- make.inc.orig 2006-01-02 00:52:00.000000000 +0100 ++++ make.inc 2012-03-13 14:59:15.000000000 +0100 +@@ -19,22 +19,23 @@ # TMGLIB = libtmglib.a SUPERLULIB = libsuperlu_3.0.a -BLASLIB = ../libblas.a -+BLASLIB = %%BLAS%% ++SUPERLULIB_SHARED = libsuperlu_3.0.so ++BLASLIB = -L/usr/local/lib -lblas # # The archiver and the flag(s) to use when building archive (library) -@@ -29,12 +29,12 @@ + # If your system has no ranlib, set RANLIB = echo. + # +-ARCH = ar ++ARCMD = ar ARCHFLAGS = cr RANLIB = ranlib -CC = cc -CFLAGS = -xO3 -xcg92 -FORTRAN = f77 -FFLAGS = -O -LOADER = cc -LOADOPTS = -xO3 -+CC = %%CC%% -+CFLAGS = %%CFLAGS%% -+FORTRAN = %%FC%% -+FFLAGS = %%FFLAGS%% -+LOADER = %%FC%% ++CC ?= gcc46 ++CFLAGS ?= -O2 -pipe -O2 -fno-strict-aliasing -pipe -O3 -pipe -fno-strict-aliasing -march=native -Wl,-rpath=/usr/local/lib/gcc46 ++FORTRAN ?= gfortran46 ++FFLAGS ?= -O -Wl,-rpath=/usr/local/lib/gcc46 ++LOADER ?= gfortran46 +LOADOPTS = # # C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase) Property changes on: head/math/superlu/files/patch-make.inc ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/math/superlu/pkg-plist =================================================================== --- head/math/superlu/pkg-plist (revision 293262) +++ head/math/superlu/pkg-plist (revision 293263) @@ -1,17 +1,19 @@ include/superlu/colamd.h include/superlu/old_colamd.h include/superlu/slu_Cnames.h include/superlu/slu_cdefs.h include/superlu/slu_dcomplex.h include/superlu/slu_ddefs.h include/superlu/slu_scomplex.h include/superlu/slu_sdefs.h include/superlu/slu_util.h include/superlu/slu_zdefs.h include/superlu/supermatrix.h lib/libsuperlu.a +lib/libsuperlu.so +lib/libsuperlu.so.3 @dirrm include/superlu %%PORTDOCS%%%%DOCSDIR%%/SLU_general.ps.gz %%PORTDOCS%%%%DOCSDIR%%/simax95.ps.gz %%PORTDOCS%%%%DOCSDIR%%/superlu_ug.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% Property changes on: head/math/superlu/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property