1. fix build on 5-CURRENT.

2. change e-mail address of maho.
3. honor CXX and CXXFLAGS.
4. modernize patch file names.
5. satisfy portlint.

Reviewed by: knu (mentor)
Reported by: bento

8 files changed, 28 insertions, 13 deletions

diff --git a/math/lapack++/Makefile b/math/lapack++/Makefile
index 2eb9f8930421..cf41f3d2b2d3 100644
--- a/math/lapack++/Makefile
+++ b/math/lapack++/Makefile
@@ -9,16 +9,15 @@ PORTNAME=	lapack++
 PORTVERSION=	1.1
 CATEGORIES=	math
 MASTER_SITES=	http://math.nist.gov/lapack++/
-DISTFILES=	Lapackpp1_1a.tgz
-DIST_SUBDIR=	lapack++
-EXTRACT_ONLY=	Lapackpp1_1a.tgz
-
+DISTNAME=	Lapackpp1_1a
 .if !defined(NOPORTDOCS)
 DISTFILES+=	lapack++.ps.gz lapackpp1_1.ps.gz lapackppman1_1.ps.gz \
 		lapack++_install.ps.gz
 .endif
+DIST_SUBDIR=	lapack++
+EXTRACT_ONLY=	Lapackpp1_1a.tgz
 
-MAINTAINER=	chat95@mbox.kyoto-inet.or.jp
+MAINTAINER=	maho@FreeBSD.org
 
 LIB_DEPENDS=	lapack:${PORTSDIR}/math/lapack \
 		atlas:${PORTSDIR}/math/atlas
@@ -36,10 +35,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/lapack++
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/lapack++.ps.gz ${DOCSDIR}
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/lapack++_install.ps.gz ${DOCSDIR}
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/lapackpp1_1.ps.gz ${DOCSDIR}
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/lapackppman1_1.ps.gz ${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapack++.ps.gz ${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapack++_install.ps.gz ${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapackpp1_1.ps.gz ${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapackppman1_1.ps.gz ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/lapack++/files/patch-blas++_test b/math/lapack++/files/patch-blaspp:testing:blas++_test
index 504663e6e22d..504663e6e22d 100644
--- a/math/lapack++/files/patch-blas++_test
+++ b/math/lapack++/files/patch-blaspp:testing:blas++_test
diff --git a/math/lapack++/files/patch-include:blas++.h b/math/lapack++/files/patch-include:blas++.h
new file mode 100644
index 000000000000..c4fbea53d662
--- /dev/null
+++ b/math/lapack++/files/patch-include:blas++.h
@@ -0,0 +1,15 @@
+--- include/blas++.h~	Tue Nov 19 13:30:26 2002
++++ include/blas++.h	Tue Nov 19 13:32:03 2002
+@@ -11,7 +11,11 @@
+ #include "blas2++.h"
+ #include "blas3++.h"
+ 
+-double abs(double);
++inline double abs(double a)
++{
++  if(a>=0) return a;
++  return -a;
++}
+ 
+ //-------------------------------------
+ // Vector/Vector operators
diff --git a/math/lapack++/files/patch-laslv.h b/math/lapack++/files/patch-include:laslv.h
index 194dc56f220e..194dc56f220e 100644
--- a/math/lapack++/files/patch-laslv.h
+++ b/math/lapack++/files/patch-include:laslv.h
diff --git a/math/lapack++/files/patch-makefile.def b/math/lapack++/files/patch-makefile.def
index 51224438f39d..c1bc73f1707e 100644
--- a/math/lapack++/files/patch-makefile.def
+++ b/math/lapack++/files/patch-makefile.def
@@ -1,16 +1,17 @@
 --- makefile.def.orig	Wed Mar  1 02:42:58 2000
-+++ makefile.def	Mon May 20 11:18:27 2002
++++ makefile.def	Tue Nov 19 13:16:28 2002
 @@ -12,11 +12,11 @@
  #		g++ 2.7.0)  Some other choices for ARCH are "SGI" and "RIOS" (RS-6000)
  #
  
 -ARCH = Linux
-+ARCH = FreeBSD
- CPP = g++
+-CPP = g++
 -CPPFLAGS =  -I$(LAPACKPP_INC) -D$(ARCH)   -Wall
 -CPPLIBS = -lm
 -CFLAGS = -I$(LAPACKPP_INC)
-+CPPFLAGS+=  $(CFLAGS) -I$(LAPACKPP_INC) -D$(ARCH)
++ARCH = FreeBSD
++CPP = $(CXX)
++CPPFLAGS+=  $(CXXFLAGS) -I$(LAPACKPP_INC) -D$(ARCH)
 +CPPLIBS+= -lm
 +CFLAGS+= -I$(LAPACKPP_INC)
  #
diff --git a/math/lapack++/files/patch-matrix_test b/math/lapack++/files/patch-matrix:testing:matrix_test
index 6043c5398b86..6043c5398b86 100644
--- a/math/lapack++/files/patch-matrix_test
+++ b/math/lapack++/files/patch-matrix:testing:matrix_test
diff --git a/math/lapack++/files/patch-eigslv.cc b/math/lapack++/files/patch-src:eigslv.cc
index c087bceb8f4f..c087bceb8f4f 100644
--- a/math/lapack++/files/patch-eigslv.cc
+++ b/math/lapack++/files/patch-src:eigslv.cc
diff --git a/math/lapack++/files/patch-lapack++_test b/math/lapack++/files/patch-testing:lapack++_test
index 9f0d5b4d5438..9f0d5b4d5438 100644
--- a/math/lapack++/files/patch-lapack++_test
+++ b/math/lapack++/files/patch-testing:lapack++_test