4 files changed, 24 insertions, 21 deletions

diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile
index 4538b1e2b9e5..268e6b0fa828 100644
--- a/math/sdpara/Makefile
+++ b/math/sdpara/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	sdpara
-PORTVERSION=	0.90
+PORTVERSION=	1.0.0
 CATEGORIES=	math parallel
-MASTER_SITES=	http://grid.r.dendai.ac.jp/sdpa/
+MASTER_SITES=   http://grid.r.dendai.ac.jp/sdpa/files/
 DISTFILES=	${PORTNAME}.${PORTVERSION}.src.tar.gz
 .if !defined(NOPORTDOCS)
 DISTFILES+=	${PORTNAME}.${PORTVERSION}.install.txt
@@ -24,14 +24,13 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack \
 		${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \
 		${LOCALBASE}/mpich/lib/libmpich.a:${PORTSDIR}/net/mpich
 
-RESTRICTED=	"unsure distribution condition"
-
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 LAPACK=		-lalapack
 CBLAS=		-lcblas -lf77blas -latlas -lg2c
+PLIST_SUB+=     PORTVERSION="${PORTVERSION}"
 
 .include <bsd.port.pre.mk>
 
@@ -44,7 +43,7 @@ CXXFLAGS+=	-mfancy-math-387 -mpreferred-stack-boundary=3
 .endif # i386
 .endif
 
-pre-build:
+post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 			      s|%%LOCALBASE%%|${LOCALBASE}|g ; \
 			      s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \
@@ -61,7 +60,7 @@ do-install:
 	${INSTALL_DATA}    ${WRKSRC}/param.sdpa ${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in sdpara.0.90.install.txt
+.for i in sdpara.${PORTVERSION}.install.txt
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${i} ${DOCSDIR}
 .endfor
 	@${MKDIR} ${EXAMPLESDIR}
diff --git a/math/sdpara/distinfo b/math/sdpara/distinfo
index 623ceddd20f7..c05bab0f3436 100644
--- a/math/sdpara/distinfo
+++ b/math/sdpara/distinfo
@@ -1,4 +1,4 @@
-MD5 (sdpara/sdpara.0.90.src.tar.gz) = cdcdf52e2226dd5e477141da10272461
-SIZE (sdpara/sdpara.0.90.src.tar.gz) = 71394
-MD5 (sdpara/sdpara.0.90.install.txt) = cdafeaeb3c897c8a52a5ee9959f2a0d8
-SIZE (sdpara/sdpara.0.90.install.txt) = 3794
+MD5 (sdpara/sdpara.1.0.0.src.tar.gz) = fa947ad1eea6b303399383c8194e7d43
+SIZE (sdpara/sdpara.1.0.0.src.tar.gz) = 78047
+MD5 (sdpara/sdpara.1.0.0.install.txt) = a4ed5a22253569b35e565b4a145e3407
+SIZE (sdpara/sdpara.1.0.0.install.txt) = 4212
diff --git a/math/sdpara/files/patch-Makefile b/math/sdpara/files/patch-Makefile
index feee9d9f0d3b..e6632c3469d3 100644
--- a/math/sdpara/files/patch-Makefile
+++ b/math/sdpara/files/patch-Makefile
@@ -1,7 +1,10 @@
---- Makefile.orig	Fri Jun  6 17:43:02 2003
-+++ Makefile	Thu Mar 18 20:25:55 2004
-@@ -1,8 +1,7 @@
--LAPACK = $(HOME)/lib/b/lapack
+--- Makefile.orig	Fri Oct  8 15:08:59 2004
++++ Makefile	Thu May 12 14:02:57 2005
+@@ -18,11 +18,10 @@
+ # This file is Makefile of SDPARA
+ # $Id: Makefile,v 1.2 2004/10/08 05:57:48 makoto Exp $
+ 
+-LAPACK = $(HOME)/lapack
 +LAPACK = %%LOCALBASE%%
  RSDPA  = .
  
@@ -11,22 +14,23 @@
  
  # if you use BLAS in clapack.tgz, use next line
  # and set NON_ATLAS_SDPA in rsdpa_include.h to 1.
-@@ -17,10 +16,11 @@
+@@ -36,10 +35,12 @@
+ #RSDPA_LIB_NAME = rsdpa
  RSDPA_LIB = -l$(RSDPA_LIB_NAME)
  
- # CC = /home/yamashi9/lib/b/mpich/bin/mpiCC
 -MPIBIN=
+-CC = $(MPIBIN)mpicxx
 +MPIBIN= %%LOCALBASE%%/mpich/bin/
- CC = $(MPIBIN)mpiCC
++CC = $(MPIBIN)mpiCC
  F77 = $(MPIBIN)mpif77
--OPTION = -O3 #-Wall # -g
+ OPTION = -O3  #-g
 +FFLAGS = %%FFLAGS%%
 +CXXFLAGS = %%CXXFLAGS%%
  
  TARGET_EXE = $(RSDPA_LIB_NAME)
  #TARGET_EXE = rsdpa_main.exe
-@@ -41,9 +41,9 @@
- 	  -L$(LAPACK)/lib $(SCALAPACK_LIB) $(LAPACK_LIB) 
+@@ -60,9 +61,9 @@
+ 	  -L$(LAPACK)/lib $(SCALAPACK_LIB) $(LAPACK_LIB)
  
  .cpp.o:
 -	$(CC) $(OPTION) -c -I$(RSDPA) -I$(LAPACK)/include $<
diff --git a/math/sdpara/pkg-plist b/math/sdpara/pkg-plist
index fd330f91115f..b7444e4992e7 100644
--- a/math/sdpara/pkg-plist
+++ b/math/sdpara/pkg-plist
@@ -8,5 +8,5 @@ share/examples/sdpara/param.sdpa
 share/sdpara/param.sdpa
 @dirrm share/sdpara
 @dirrm share/examples/sdpara
-%%PORTDOCS%%%%DOCSDIR%%/sdpara.0.90.install.txt
+%%PORTDOCS%%%%DOCSDIR%%/sdpara.%%PORTVERSION%%.install.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%