Unbreak by updating to 6.2.0

and now it is relased under GPL

Submitted by:	kris (broken report)

4 files changed, 25 insertions, 26 deletions

diff --git a/math/sdpa/Makefile b/math/sdpa/Makefile
index b7479839f0c7..10e5bd42cf06 100644
--- a/math/sdpa/Makefile
+++ b/math/sdpa/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	sdpa
-PORTVERSION=	6.00
-PORTREVISION=	2
+PORTVERSION=	6.2.0
 CATEGORIES=	math
-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}.manual.ps.gz \
@@ -22,15 +21,11 @@ EXTRACT_ONLY=	${PORTNAME}.${PORTVERSION}.src.tar.gz
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	SDPA(SemiDefinite Programming Algorithm) Very efficent SDP Solver
 
-BROKEN=		Unfetchable
-
 .if defined(WITH_ICC)
 BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
 .endif
 LIB_DEPENDS=	atlas:${PORTSDIR}/math/atlas
 
-RESTRICTED=	"unsure distribution condition"
-
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -42,13 +37,14 @@ CBLAS=		-lptcblas -lptf77blas -latlas_r -lg2c ${PTHREAD_LIBS}
 LAPACK=		-lalapack
 CBLAS=		-lcblas -lf77blas -latlas -lg2c
 .endif
+PLIST_SUB+=     PORTVERSION="${PORTVERSION}"
 #WITH_SMP=	yes
 #WITH_ICC=	yes
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations
 CXXFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
-.if (${MACHINE_ARCH} == "i386" && !${MACHINE_ARCH} == "amd64" )
+.if (${ARCH} == "i386" && !${MACHINE_ARCH} == "amd64" )
 CFLAGS+=	 -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 CXXFLAGS+=	 -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 .endif # i386
@@ -86,7 +82,7 @@ do-install:
 	${INSTALL_DATA}    ${WRKSRC}/param.sdpa ${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in sdpa.6.00.manual.ps.gz sdpa.6.00.manual.pdf sdpa.6.00.install.txt
+.for i in ${PORTNAME}.${PORTVERSION}.manual.ps.gz ${PORTNAME}.${PORTVERSION}.manual.pdf ${PORTNAME}.${PORTVERSION}.install.txt
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${i} ${DOCSDIR}
 .endfor
 	@${MKDIR} ${EXAMPLESDIR}
diff --git a/math/sdpa/distinfo b/math/sdpa/distinfo
index a6a05bc18f13..246476877732 100644
--- a/math/sdpa/distinfo
+++ b/math/sdpa/distinfo
@@ -1,8 +1,8 @@
-MD5 (sdpa/sdpa.6.00.src.tar.gz) = 23839a6cd750ba6d5832b10741ce307c
-SIZE (sdpa/sdpa.6.00.src.tar.gz) = 246642
-MD5 (sdpa/sdpa.6.00.manual.ps.gz) = f5bf16660f2980903a41dc377fd6d262
-SIZE (sdpa/sdpa.6.00.manual.ps.gz) = 187624
-MD5 (sdpa/sdpa.6.00.manual.pdf) = a2c22d9b56f2fe9e6895e4f1ada672ae
-SIZE (sdpa/sdpa.6.00.manual.pdf) = 232574
-MD5 (sdpa/sdpa.6.00.install.txt) = 6a0a6c1834ee7ad38ea257a39b30a0fd
-SIZE (sdpa/sdpa.6.00.install.txt) = 8057
+MD5 (sdpa/sdpa.6.2.0.src.tar.gz) = 643f1057881817dab8247a375bc6b3fe
+SIZE (sdpa/sdpa.6.2.0.src.tar.gz) = 64193
+MD5 (sdpa/sdpa.6.2.0.manual.ps.gz) = ce4efa43821b3aa02af2210635e53ecb
+SIZE (sdpa/sdpa.6.2.0.manual.ps.gz) = 187820
+MD5 (sdpa/sdpa.6.2.0.manual.pdf) = 52972c003576da11cad5c84d0648ad99
+SIZE (sdpa/sdpa.6.2.0.manual.pdf) = 232380
+MD5 (sdpa/sdpa.6.2.0.install.txt) = bc2cc604e0b862487f76f3e73ae346a8
+SIZE (sdpa/sdpa.6.2.0.install.txt) = 7824
diff --git a/math/sdpa/files/patch-Makefile b/math/sdpa/files/patch-Makefile
index b36fa563eb36..fce34229a7a4 100644
--- a/math/sdpa/files/patch-Makefile
+++ b/math/sdpa/files/patch-Makefile
@@ -1,7 +1,10 @@
---- Makefile.orig	Fri Jun  6 10:13:51 2003
-+++ Makefile	Sat Oct  4 11:33:31 2003
-@@ -1,8 +1,7 @@
--LAPACK = $(HOME)/lib/b/lapack
+--- Makefile.orig	Fri Apr  8 12:17:04 2005
++++ Makefile	Thu May 12 11:23:34 2005
+@@ -19,11 +19,10 @@
+ # $Id: Makefile,v 1.3 2004/09/02 01:14:19 makoto Exp $
+ 
+ 
+-LAPACK = $(HOME)/lapack
 +LAPACK = %%LOCALBASE%%
  RSDPA  = .
  
@@ -11,12 +14,12 @@
  
  # if you use BLAS in clapack.tgz, use next line
  # and set NON_ATLAS_SDPA in rsdpa_include.h to 1.
-@@ -14,8 +13,8 @@
+@@ -35,8 +34,8 @@
  #RSDPA_LIB_NAME = rsdpa
  RSDPA_LIB = -l$(RSDPA_LIB_NAME)
  
 -CC = g++
--OPTION = -O3 # -Wall # -g
+-OPTION = -O3 # -g # -Wall
 +CC = %%CXX%%
 +OPTION = %%CXXFLAGS%%
  
diff --git a/math/sdpa/pkg-plist b/math/sdpa/pkg-plist
index c1e7ee5f65d0..7133fb0b68d2 100644
--- a/math/sdpa/pkg-plist
+++ b/math/sdpa/pkg-plist
@@ -22,7 +22,7 @@ share/examples/sdpa/param.sdpa
 share/sdpa/param.sdpa
 @dirrm share/sdpa
 @dirrm share/examples/sdpa
-%%PORTDOCS%%%%DOCSDIR%%/sdpa.6.00.manual.ps.gz
-%%PORTDOCS%%%%DOCSDIR%%/sdpa.6.00.manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/sdpa.6.00.install.txt
+%%PORTDOCS%%%%DOCSDIR%%/sdpa.%%PORTVERSION%%.manual.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/sdpa.%%PORTVERSION%%.manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/sdpa.%%PORTVERSION%%.install.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%