aboutsummaryrefslogtreecommitdiffstats
path: root/math
diff options
context:
space:
mode:
authorstefan <stefan@FreeBSD.org>2008-12-12 22:39:50 +0800
committerstefan <stefan@FreeBSD.org>2008-12-12 22:39:50 +0800
commiteb684fe2702b2a793edb90c6baca8e3bb34dc2f4 (patch)
treec2abe5aa90eadbe9430f983fa822d237bedcbe9c /math
parentfe9b854ad04f9e0dd8701c819497fdbdbe73a089 (diff)
downloadfreebsd-ports-gnome-eb684fe2702b2a793edb90c6baca8e3bb34dc2f4.tar.gz
freebsd-ports-gnome-eb684fe2702b2a793edb90c6baca8e3bb34dc2f4.tar.zst
freebsd-ports-gnome-eb684fe2702b2a793edb90c6baca8e3bb34dc2f4.zip
Integrate a patch from http://reuter.mit.edu/index.php/software/arpackpatch/
which fixes ARPACK++ 1.2 to work with g++ 4.0.2 and above. PR: 121194 Submitted by: "Reed A. Cartwright" <reed@scit.us> Patch by: stefan
Diffstat (limited to 'math')
-rw-r--r--math/arpack++/Makefile10
-rw-r--r--math/arpack++/distinfo3
-rw-r--r--math/arpack++/files/patch-Makefile.inc51
3 files changed, 36 insertions, 28 deletions
diff --git a/math/arpack++/Makefile b/math/arpack++/Makefile
index 56756b32fec1..add99110565c 100644
--- a/math/arpack++/Makefile
+++ b/math/arpack++/Makefile
@@ -7,12 +7,17 @@
PORTNAME= arpack++
PORTVERSION= 1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MASTER_SITES= http://www.ime.unicamp.br/%7echico/arpack++/
DISTNAME= ${PORTNAME}
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
+PATCH_SITES= http://reuter.mit.edu/blue/software/ \
+ http://www.gdv.uni-hannover.de/~reuter/software/
+PATCHFILES= arpack++1.2.patch.diff
+PATCH_DIST_STRIP= -p1
+
MAINTAINER= ports@FreeBSD.org
COMMENT= ARPACK++ is an object-oriented version of the ARPACK package
@@ -44,7 +49,8 @@ USE_GMAKE= yes
DOCS= README doc/arpackpp.ps.gz doc/bugs.txt doc/structure.txt
post-patch:
- @${RM} ${WRKSRC}/include/arlutil.h.orig
+ @${FIND} ${WRKSRC}/include -name "*.orig" -delete
+ @${FIND} ${WRKSRC}/examples -name "*.orig" -delete
.if !defined(NOPORTDOCS)
@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile.inc
diff --git a/math/arpack++/distinfo b/math/arpack++/distinfo
index 3e00b437225e..ef6b86c740e7 100644
--- a/math/arpack++/distinfo
+++ b/math/arpack++/distinfo
@@ -1,3 +1,6 @@
MD5 (arpack++-1.2/arpack++.tar.gz) = ba746bd46ea53ed2f141c806e36c60b2
SHA256 (arpack++-1.2/arpack++.tar.gz) = 61e85474b70ee5b0a2b0cc5a7db7acc26131a48269f546e2b8dc3e92264523b3
SIZE (arpack++-1.2/arpack++.tar.gz) = 3485328
+MD5 (arpack++-1.2/arpack++1.2.patch.diff) = d76be44d4962f362675de541899f1787
+SHA256 (arpack++-1.2/arpack++1.2.patch.diff) = 43e2b88aa6c76a3ddc49fd0ec8fd589914bda5a1593042572f99d76ad260c93a
+SIZE (arpack++-1.2/arpack++1.2.patch.diff) = 309992
diff --git a/math/arpack++/files/patch-Makefile.inc b/math/arpack++/files/patch-Makefile.inc
index 13365323498c..720b6003aa2b 100644
--- a/math/arpack++/files/patch-Makefile.inc
+++ b/math/arpack++/files/patch-Makefile.inc
@@ -1,6 +1,6 @@
---- Makefile.inc.orig Wed Apr 5 14:00:59 2000
-+++ Makefile.inc Mon Oct 20 21:56:56 2003
-@@ -1,25 +1,27 @@
+--- Makefile.inc.orig 2008-12-12 15:10:18.000000000 +0100
++++ Makefile.inc 2008-12-12 15:12:13.000000000 +0100
+@@ -1,26 +1,27 @@
-# ARPACK++ v1.2 2/18/2000
+# ARPACK++ v1.2 2/20/2000
+# $FreeBSD$
@@ -12,7 +12,7 @@
# Defining the machine.
--PLAT = solaris
+-PLAT = linux
+PLAT = `uname -s`
# Defining the compiler.
@@ -24,36 +24,35 @@
# ARPACKPP_INC is the directory that contains all arpack++ header files.
# SUPERLU_DIR and UMFPACK_DIR must be set to ARPACKPP_INC.
--ARPACKPP_DIR = $(HOME)/arpack++
+-#ARPACKPP_DIR = $(HOME)/arpack++
+-ARPACKPP_DIR = ../../..
-ARPACKPP_INC = $(ARPACKPP_DIR)/include
-SUPERLU_DIR = $(ARPACKPP_INC)
-UMFPACK_DIR = $(ARPACKPP_INC)
-+ARPACK_INC = %%LOCALBASE%%/include
-+ARPACKPP_DIR = %%LOCALBASE%%
++ARPACK_INC = /usr/local/include
++ARPACKPP_DIR = /usr/local
+ARPACKPP_INC = $(ARPACKPP_DIR)/include/ARPACK++
-+SUPERLU_DIR = %%LOCALBASE%%/include/superlu
-+UMFPACK_DIR = %%LOCALBASE%%/include/UMFPACK
++SUPERLU_DIR = /usr/local/include/superlu
++UMFPACK_DIR = /usr/local/include/UMFPACK
# Defining ARPACK, LAPACK, UMFPACK, SUPERLU, BLAS and FORTRAN libraries.
# See the arpack++ manual or the README file for directions on how to
-@@ -33,31 +35,26 @@
+@@ -34,29 +35,26 @@
# Other libraries should be defined if the user intends to compile
# arpack++ on another environment.
--ARPACK_LIB = $(HOME)/lib/arpack_$(PLAT).a
--LAPACK_LIB = /opt/LAPACK/lapack_$(PLAT).a
--UMFPACK_LIB = $(HOME)/lib/umfpack_$(PLAT).a
--SUPERLU_LIB = $(HOME)/lib/superlu_$(PLAT).a
--BLAS_LIB = /opt/LAPACK/blas_$(PLAT).a
--FORTRAN_LIBS = /opt/SUNWspro/SC4.0/lib/libF77.a \
-- /opt/SUNWspro/SC4.0/lib/libM77.a \
-- /opt/SUNWspro/SC4.0/lib/libsunmath.a
-+ARPACK_LIB = %%LOCALBASE%%/lib/libarpack.a
-+LAPACK_LIB = %%LOCALBASE%%/lib/liblapack.a
-+UMFPACK_LIB = %%LOCALBASE%%/lib/libumfpack.a
-+SUPERLU_LIB = %%LOCALBASE%%/lib/libsuperlu.a
-+BLAS_LIB = %%LOCALBASE%%/lib/libf77blas.a %%LOCALBASE%%/lib/libatlas.a
-+FORTRAN_LIBS = -lg2c
+-ARPACK_LIB = -larpack
+-LAPACK_LIB = -llapack
+-UMFPACK_LIB = #-lumfpack
+-SUPERLU_LIB = /usr/lib/libsuperlu.a
+-BLAS_LIB = -lblas
+-FORTRAN_LIBS = -lg2c
++ARPACK_LIB = /usr/local/lib/libarpack.a
++LAPACK_LIB = /usr/local/lib/liblapack.a
++UMFPACK_LIB = /usr/local/lib/libumfpack.a
++SUPERLU_LIB = /usr/local/lib/libsuperlu.a
++BLAS_LIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a
++FORTRAN_LIBS = -L/usr/local/lib/gcc-4.2.5 -lgfortran
# Defining g++ flags and directories.
@@ -63,10 +62,10 @@
CPP_DEBUG = -g
-CPP_OPTIM = -O
-CPP_LIBS =
--CPP_INC = /usr/local/include/g++-3
+-CPP_INC =
+#CPP_OPTIM = -O
+CPP_LIBS = -lm
-+CPP_INC = %%LOCALBASE%%/include
++CPP_INC = /usr/local/include
-CPP_FLAGS = $(CPP_DEBUG) -D$(PLAT) -I$(ARPACKPP_INC) -I$(CPP_INC) \
- $(CPP_WARNINGS)