Update to 3.4.2.

Includes staging support and updates to the LIB_DEPENDS syntax.

PR:		191060
Submitted by:	phd_kimberlite@yahoo.co.jp (maintainer)

5 files changed, 2 insertions, 103 deletions

diff --git a/math/lapacke/files/Makefile.lib b/math/lapacke/files/Makefile.lib
index 8b907e4d90e1..19f986a2b234 100644
--- a/math/lapacke/files/Makefile.lib
+++ b/math/lapacke/files/Makefile.lib
@@ -1119,7 +1119,7 @@ UTILS_SRCS=\
 		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 <bsd.lib.mk>
diff --git a/math/lapacke/files/patch-include+lapacke.h b/math/lapacke/files/patch-include+lapacke.h
deleted file mode 100644
index 9c37f0029534..000000000000
--- a/math/lapacke/files/patch-include+lapacke.h
+++ /dev/null
@@ -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 --git a/math/lapacke/files/patch-make.inc b/math/lapacke/files/patch-make.inc
deleted file mode 100644
index 30f9d54a6e8e..000000000000
--- a/math/lapacke/files/patch-make.inc
+++ /dev/null
@@ -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 --git a/math/lapacke/files/patch-testing+Makefile b/math/lapacke/files/patch-testing+Makefile
deleted file mode 100644
index fab617b08eb3..000000000000
--- a/math/lapacke/files/patch-testing+Makefile
+++ /dev/null
@@ -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 --git a/math/lapacke/files/patch-testing+interface+Makefile b/math/lapacke/files/patch-testing+interface+Makefile
deleted file mode 100644
index a5ce372bba59..000000000000
--- a/math/lapacke/files/patch-testing+interface+Makefile
+++ /dev/null
@@ -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)