diff -uNr /usr/ports/math/lapacke/./Makefile ./Makefile --- /usr/ports/math/lapacke/./Makefile 2014-03-11 05:55:20.000000000 +0900 +++ ./Makefile 2014-06-15 22:01:23.000000000 +0900 @@ -2,13 +2,12 @@ # $FreeBSD: head/math/lapacke/Makefile 347809 2014-03-10 20:55:20Z gerald $ PORTNAME= lapacke -PORTVERSION= 3.4.0 -PORTREVISION= 2 +PORTVERSION= 3.4.2 CATEGORIES= math MASTER_SITES= NL MASTER_SITE_SUBDIR= lapack DISTNAME= lapack-${PORTVERSION} -DISTFILES= ${DISTNAME}.tgz lapacke.tgz +EXTRACT_SUFX= .tgz DIST_SUBDIR= lapack MAINTAINER= phd_kimberlite@yahoo.co.jp @@ -24,8 +23,7 @@ PROFILE_DESC= Build a profiling library XLAPACKE_DESC= Install interfaces to XLAPACK -NO_STAGE= yes -.include +.include LAPACKE_SVERSION= 1 LAPACKE_LIBNAME= lapacke @@ -50,25 +48,25 @@ .endif .if ${WITH_BLAS} == "reference" -LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas \ - lapack.4:${PORTSDIR}/math/lapack +LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas \ + liblapack.so:${PORTSDIR}/math/lapack BLAS= -lblas LAPACK= -llapack .elif ${WITH_BLAS} == "gotoblas" CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -LIB_DEPENDS+= goto2p.1:${PORTSDIR}/math/gotoblas +LIB_DEPENDS+= libgoto2p.so:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p LAPACK= -lgoto2p .elif ${WITH_BLAS} == "atlas" CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas +LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas BLAS= -lptf77blas LAPACK= -lalapack -lptcblas .endif .if ${PORT_OPTIONS:MXLAPACKE} -LIB_DEPENDS+= xlapack.4:${PORTSDIR}/math/xlapack +LIB_DEPENDS+= libxlapack.so:${PORTSDIR}/math/xlapack .endif LDFLAGS+= -L${LOCALBASE}/lib @@ -107,23 +105,12 @@ MAKE_ENV+= NO_PROFILE= .endif -post-extract: - @${CP} -r ${WRKSRC_LEGACY}/testing ${WRKSRC}/. - post-patch: @${FIND} ${WRKSRC} -name "Makefile*" -type f |\ ${XARGS} ${REINPLACE_CMD} -e 's;$$(ARCH);$$(ARCH_);g' - @${REINPLACE_CMD} -e 's;%%CC%%;${CC};g' \ - -e 's;%%CFLAGS%%;${CFLAGS};g' \ - -e 's;%%LDFLAGS%%;${LDFLAGS};g' \ - -e 's;%%AR%%;${AR};g' \ - -e 's;%%RANLIB%%;${RANLIB};g' \ - -e 's;%%BLAS%%;${BLAS};g' \ - -e 's;%%LAPACK%%;${LAPACK};g' \ - -e 's;%%LAPACKE_LIBNAME%%;${LAPACKE_LIBNAME};g' \ - ${WRKSRC}/make.inc @${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist @${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile + @${CP} ${WRKSRC}/include//lapacke_mangling_with_flags.h ${WRKSRC}/include//lapacke_mangling.h @${MKDIR} ${WRKSRC}/lib @${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/lib/Makefile @${MKDIR} ${WRKSRC}/libtmg @@ -146,15 +133,8 @@ post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .endif -check regression-test test: build - @${CP} ${WRKSRC}/lib/lib${LAPACKE_LIBNAME}.a ${WRKSRC}/. - @${ECHO_CMD} "Testing static lapacke library" - @(cd ${WRKSRC}/testing; ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS}) - @${CAT} ${WRKSRC}/testing/interface/*.out - -.include +.include diff -uNr /usr/ports/math/lapacke/./distinfo ./distinfo --- /usr/ports/math/lapacke/./distinfo 2014-01-23 00:30:13.000000000 +0900 +++ ./distinfo 2014-06-15 20:59:58.000000000 +0900 @@ -1,4 +1,2 @@ -SHA256 (lapack/lapack-3.4.0.tgz) = a7139ef97004d0e3c4c30f1c52d508fd7ae84b5fbaf0dd8e792c167dc306c3e9 -SIZE (lapack/lapack-3.4.0.tgz) = 6127787 -SHA256 (lapack/lapacke.tgz) = 7f992bd1f143251ddd03b99ef935942c17caf43652ae94a251601e00dce258e3 -SIZE (lapack/lapacke.tgz) = 840233 +SHA256 (lapack/lapack-3.4.2.tgz) = 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0 +SIZE (lapack/lapack-3.4.2.tgz) = 6168281 diff -uNr /usr/ports/math/lapacke/./files/Makefile.lib ./files/Makefile.lib --- /usr/ports/math/lapacke/./files/Makefile.lib 2014-01-23 02:00:46.000000000 +0900 +++ ./files/Makefile.lib 2014-06-15 21:10:18.000000000 +0900 @@ -1119,7 +1119,7 @@ lapacke_ztr_nancheck.c lapacke_ztr_trans.c %%XLAPACKE%%beforeinstall: -%%XLAPACKE%% ${BSD_INSTALL_DATA} ${.CURDIR}/../include/lapacke.h ${PREFIX}/include -%%XLAPACKE%% ${BSD_INSTALL_DATA} ${.CURDIR}/../include/lapacke_utils.h ${PREFIX}/include +%%XLAPACKE%% ${BSD_INSTALL_DATA} ${.CURDIR}/../include/lapacke.h ${DESTDIR}${PREFIX}/include +%%XLAPACKE%% ${BSD_INSTALL_DATA} ${.CURDIR}/../include/lapacke_utils.h ${DESTDIR}${PREFIX}/include .include diff -uNr /usr/ports/math/lapacke/./files/patch-include+lapacke.h ./files/patch-include+lapacke.h --- /usr/ports/math/lapacke/./files/patch-include+lapacke.h 2014-01-23 02:40:44.000000000 +0900 +++ ./files/patch-include+lapacke.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- include/lapacke.h.orig 2010-12-03 20:56:19.000000000 +0900 -+++ include/lapacke.h 2010-12-03 20:56:59.000000000 +0900 -@@ -84,7 +84,7 @@ - #endif - - #ifndef lapack_complex_float_imag --#define lapack_complex_float_imag(z) (imag(z)) -+#define lapack_complex_float_imag(z) (cimag(z)) - #endif - - lapack_complex_float lapack_make_complex_float( float re, float im ); -@@ -100,7 +100,7 @@ - #endif - - #ifndef lapack_complex_double_imag --#define lapack_complex_double_imag(z) (imag(z)) -+#define lapack_complex_double_imag(z) (cimag(z)) - #endif - - lapack_complex_double lapack_make_complex_double( double re, double im ); diff -uNr /usr/ports/math/lapacke/./files/patch-make.inc ./files/patch-make.inc --- /usr/ports/math/lapacke/./files/patch-make.inc 2014-01-23 02:40:44.000000000 +0900 +++ ./files/patch-make.inc 1970-01-01 09:00:00.000000000 +0900 @@ -1,31 +0,0 @@ ---- make.inc.orig 2011-11-10 07:56:15.000000000 +0900 -+++ make.inc 2011-12-03 20:22:18.000000000 +0900 -@@ -47,20 +47,19 @@ - # LDFLAGS = -nofor-main - # - gfortran, set: LINKER = gfortran - # --CC = gcc --CFLAGS = --LINKER = gfortran --LDFLAGS = -+CC = %%CC%% -+CFLAGS = %%CFLAGS%% -+LINKER = $(CC) -+LDFLAGS = %%LDFLAGS%% - # - # The name of the libraries to be created/linked to - # Ensure that the libraries have the same data model (LP64/ILP64). - # --LAPACKE = lapacke.a --LIBS = /Users/julie/Documents/Boulot/lapack-dev/lapack/trunk/lapack_LINUX.a \ -- /Users/julie/Documents/Boulot/lapack-dev/lapack/trunk/blas_LINUX.a -lm -+LAPACKE = ./lib%%LAPACKE_LIBNAME%%.a -+LIBS = %%LAPACK%% %%BLAS%% - # The archiver and the flag(s) to use when building archive (library) - # If your system has no ranlib, set RANLIB = echo. - # --ARCH = ar -+ARCH_ = %%AR%% - ARCHFLAGS = cr --RANLIB = ranlib -+RANLIB = %%RANLIB%% diff -uNr /usr/ports/math/lapacke/./files/patch-testing+Makefile ./files/patch-testing+Makefile --- /usr/ports/math/lapacke/./files/patch-testing+Makefile 2014-01-23 02:40:44.000000000 +0900 +++ ./files/patch-testing+Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,16 +0,0 @@ ---- ./testing/Makefile.orig 2010-10-01 17:17:25.000000000 +0900 -+++ ./testing/Makefile 2011-09-30 19:38:00.000000000 +0900 -@@ -35,9 +35,9 @@ - include ../make.inc - - all: -- cd utils && $(MAKE) -- cd interface && $(MAKE) -+ cd ${.CURDIR}/utils && $(MAKE) -+ cd ${.CURDIR}/interface && $(MAKE) - - clean: -- cd utils && $(MAKE) clean -- cd interface && $(MAKE) clean -+ cd ${.CURDIR}/utils && $(MAKE) clean -+ cd ${.CURDIR}/interface && $(MAKE) clean diff -uNr /usr/ports/math/lapacke/./files/patch-testing+interface+Makefile ./files/patch-testing+interface+Makefile --- /usr/ports/math/lapacke/./files/patch-testing+interface+Makefile 2014-01-23 02:40:44.000000000 +0900 +++ ./files/patch-testing+interface+Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,34 +0,0 @@ ---- testing/interface/Makefile.orig 2010-12-06 20:30:08.000000000 +0900 -+++ testing/interface/Makefile 2010-12-06 20:38:46.000000000 +0900 -@@ -497,9 +497,9 @@ - zupgtr_1 \ - zupmtr_1 - --OBJ = $(TST:%=%.o) --EXE = $(TST:%=x%) --OUT = $(TST:%=%.out) -+OBJ = ${TST:N*.h:R:S/$/.o/} -+EXE = ${TST} -+OUT = ${TST:N*.h:R:S/$/.out/} - - AUX = ../utils/compare_complex_doubles.o \ - ../utils/compare_complex_floats.o \ -@@ -510,14 +510,10 @@ - - tst: $(OUT) - --%.out : x% -- ./$< > $@ -- --x% : %.o -- $(LINKER) $(LDFLAGS) $< -o $@ $(AUX) ../../$(LAPACKE) $(LIBS) -- --%.o : %.c -- $(CC) -c $(CFLAGS) -I ../include -I ../../include -o $@ $< -+.c.out : -+ $(CC) -c $(CFLAGS) -I ../include -I ../../include $< -+ $(LINKER) $(LDFLAGS) $*.o -o $* $(AUX) ../../$(LAPACKE) $(LIBS) -+ ./$* > $@ - - clean: - rm -f $(EXE) $(OBJ)