Update to 2.1.11p1.

Partially based on: infofarmer@'s patch.

17 files changed, 525 insertions, 268 deletions

diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile
index e600d7fbf749..5e4f79bd1972 100644
--- a/math/gotoblas/Makefile
+++ b/math/gotoblas/Makefile
@@ -6,32 +6,36 @@
 #
 
 PORTNAME=	gotoblas
-PORTVERSION=	1.26
-PORTREVISION=	2
+PORTVERSION=	2.${GOTOBLAS2VER}
 CATEGORIES=	math
-MASTER_SITES=	#empty
-DISTNAME=	GotoBLAS-${PORTVERSION}
+MASTER_SITES=	ftp://ftp.netlib.org/lapack/:lapack ftp://ftp.netlib.org/lapack/timing/:lapack_tmg
+DISTFILES=	GotoBLAS2-${GOTOBLAS2VER}.tar.gz lapack-3.1.1.tgz:lapack large.tgz:lapack_tmg timing.tgz:lapack_tmg
+EXTRACT_ONLY=   ${GOTOBLAS2_SRCFILE}
 
 MAINTAINER=	maho@FreeBSD.org
-COMMENT=	The fastest implementation of the Basic Linear Algebra Subroutines
-
+COMMENT=	A fast implementation of Basic Linear Algebra Subprograms
+
+DIST_SUBDIR=	gotoblas
+GOTOBLAS2VER=	1.11p1
+GOTOBLAS2_SRCFILE=	GotoBLAS2-${GOTOBLAS2VER}.tar.gz
+LAPACK_SRCFILE=	lapack-3.1.1.tgz
+LARGE_FILE=	large.tgz
+TIMING_FILE=	timing.tgz
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 RESTRICTED=	Redistribution not permitted
-MANUAL_PACKAGE_BUILD=	Please obtain the source code manyally from http://www.tacc.utexas.edu/resources/software/
-WRKSRC=		${WRKDIR}/GotoBLAS
-PLIST_FILES=	lib/libgoto.a \
-		lib/libgoto.so \
-		lib/libgoto.so.1 \
-		lib/libgotop.a \
-		lib/libgotop.so \
-		lib/libgotop.so.1
+MANUAL_PACKAGE_BUILD=	Please obtain the source code manyally from http://www.tacc.utexas.edu/tacc-projects/
+WRKSRC=		${WRKDIR}/GotoBLAS2
 
-USE_PERL5=	yes
+USE_PERL5_BUILD=	yes
+USE_FORTRAN=   yes
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+GOTOLIBS=	libgoto2 libgoto2p
+GOTOFILES=	${GOTOLIBS:S|$|.so|} ${GOTOLIBS:S|$|.so.1|} ${GOTOLIBS:S|$|.a|}
+PLIST_FILES=	${GOTOFILES:S|^|lib/|}
 
 .include <bsd.port.pre.mk>
 
-USE_FORTRAN=   yes
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 
 .if ${ARCH} == "amd64" || ${ARCH} == "alpha" || ${ARCH} == "sparc64" || ${ARCH} == "ia64"
@@ -44,7 +48,7 @@ MAKE_FLAGS+=	BINARY32=1
 MAKE_FLAGS+=	INTERFACE64=1
 .endif
 
-.if defined(WITH_G77)
+.if defined(WITH_GFORTRAN)
 MAKE_FLAGS+=	F_COMPILER=GFORTRAN
 .elif defined(WITH_G77)
 MAKE_FLAGS+=	F_COMPILER=G77
@@ -60,10 +64,14 @@ MAKE_FLAGS+=	F_COMPILER=PATHF90
 MAKE_FLAGS+=	F_COMPILER=IBM
 .endif
 
-MAKE_FLAGS_SMP=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+.if !defined(PACKAGE_BUILDING) && !exists(${DISTDIR}/${GOTOBLAS2_SRCFILE})
+do-fetch:
+	@${ECHO_CMD} "You need to fetch ${DISTFILES} from:"
+	@${ECHO_CMD} "http://www.tacc.utexas.edu/tacc-projects/"
+	@${ECHO_CMD} "and put it in ${DISTDIR}."
+.endif
 
-pre-everything::
+pre-build::
 	@${ECHO_CMD} "****"
 	@${ECHO_CMD} "You can choose FORTRAN compiler" \
 		"by using the following knobs:"
@@ -80,43 +88,38 @@ pre-everything::
 	@${ECHO_CMD} "- None is specified, gfortran will be used."
 	@${ECHO_CMD} "****"
 
-.if !defined(PACKAGE_BUILDING) && !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
-do-fetch:
-	@${ECHO_CMD} "You need to fetch ${DISTFILES} from:"
-	@${ECHO_CMD} "http://www.tacc.utexas.edu/resources/software/software.php"
-	@${ECHO_CMD} "and put it to ${DISTDIR}."
-.endif
-
-#Honor FC and CC, but this makes Makefile.rule bit dirtier
-pre-build:
+post-patch:
 	@${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" ${WRKSRC}/Makefile.rule
 
 do-build:
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${LAPACK_SRCFILE} ${WRKSRC}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${LARGE_FILE} ${WRKSRC}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${TIMING_FILE} ${WRKSRC}
 	${MKDIR} ${WRKDIR}/lib
-	cd ${WRKSRC} && \
-		${GMAKE} ${MAKE_FLAGS}
-	cd ${WRKSRC}/exports \
-		&& ${GMAKE} ${MAKE_FLAGS} so
-	${INSTALL_DATA} ${WRKSRC}/libgoto-r${PORTVERSION}.a \
-		${WRKDIR}/lib/libgoto.a
-	${INSTALL_DATA} ${WRKSRC}/libgoto-r${PORTVERSION}.so \
-		${WRKDIR}/lib/libgoto.so.1
+	cd ${WRKSRC} && ${GMAKE} ${MAKE_FLAGS} USE_THREAD=1 #DYNAMIC_ARCH=1
+	cd ${WRKSRC}/exports && ${GMAKE} ${MAKE_FLAGS} USE_THREAD=1 #DYNAMIC_ARCH=1
+	${INSTALL_DATA} ${WRKSRC}/libgoto2.a ${WRKDIR}/lib/libgoto2p.a
+	${INSTALL_DATA} ${WRKSRC}/libgoto2.so ${WRKDIR}/lib/libgoto2p.so
+
 	cd ${WRKSRC} && ${GMAKE} clean
-	cd ${WRKSRC} && \
-		${GMAKE} ${MAKE_FLAGS_SMP} ${MAKE_FLAGS} SMP=1
-	cd ${WRKSRC}/exports && \
-		${GMAKE} ${MAKE_FLAGS_SMP} ${MAKE_FLAGS} SMP=1 so
-	${INSTALL_DATA} ${WRKSRC}/libgotop-r${PORTVERSION}.a \
-		${WRKDIR}/lib/libgotop.a
-	${INSTALL_DATA} ${WRKSRC}/libgotop-r${PORTVERSION}.so \
-		${WRKDIR}/lib/libgotop.so.1
+	cd ${WRKSRC}/exports && ${GMAKE} clean
+	cd ${WRKSRC} && ${GMAKE} ${MAKE_FLAGS} USE_THREAD=0 #DYNAMIC_ARCH=0
+	cd ${WRKSRC}/exports && ${GMAKE} ${MAKE_FLAGS} USE_THREAD=0 #DYNAMIC_ARCH=0
+	${INSTALL_DATA} ${WRKSRC}/libgoto2.a ${WRKDIR}/lib/libgoto2.a
+	${INSTALL_DATA} ${WRKSRC}/libgoto2.so ${WRKDIR}/lib/libgoto2.so
+
+benchmark:
+	cd ${WRKSRC}/ && \
+		${GMAKE} ${MAKE_FLAGS} hpl
+	cd ${WRKSRC}/benchmark && \
+		${GMAKE} ${MAKE_FLAGS} dlinpack.goto
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/lib/libgoto.a ${PREFIX}/lib/libgoto.a
-	${INSTALL_DATA} ${WRKDIR}/lib/libgoto.so.1 ${PREFIX}/lib/libgoto.so.1
-	${INSTALL_DATA} ${WRKDIR}/lib/libgotop.a ${PREFIX}/lib/libgotop.a
-	${INSTALL_DATA} ${WRKDIR}/lib/libgotop.so.1 ${PREFIX}/lib/libgotop.so.1
-	cd ${PREFIX}/lib && ${LN} -s -f libgoto.so.1 libgoto.so
-	cd ${PREFIX}/lib && ${LN} -s -f libgotop.so.1 libgotop.so
+	cd ${WRKDIR}/lib/ && \
+	${INSTALL_DATA} ${GOTOLIBS:S|$|.a|} ${PREFIX}/lib/ && \
+	${INSTALL_DATA} ${GOTOLIBS:S|$|.so|} ${PREFIX}/lib/
+	cd ${PREFIX}/lib/ && \
+	for i in ${GOTOLIBS:S|$|.so|}; do \
+		${LN} -sf $$i $$i.1;done
 
 .include <bsd.port.post.mk>
diff --git a/math/gotoblas/distinfo b/math/gotoblas/distinfo
index 8e8a81cb91c9..a6dbb78a6c2d 100644
--- a/math/gotoblas/distinfo
+++ b/math/gotoblas/distinfo
@@ -1,3 +1,12 @@
-MD5 (GotoBLAS-1.26.tar.gz) = 35c6985deb9f69579dc09a1b71e3dbfc
-SHA256 (GotoBLAS-1.26.tar.gz) = 02fba0eef1c01da323edd609820dfac5d6485f99faca2045d2f93617ef6f86e9
-SIZE (GotoBLAS-1.26.tar.gz) = 2212072
+MD5 (gotoblas/GotoBLAS2-1.11p1.tar.gz) = 32549e132aee02436ab424bce037ff5d
+SHA256 (gotoblas/GotoBLAS2-1.11p1.tar.gz) = 4c1a2332b31f87e31997691db78b6f8de9d48600efad733fb7e26ac3ff79b2af
+SIZE (gotoblas/GotoBLAS2-1.11p1.tar.gz) = 2924739
+MD5 (gotoblas/lapack-3.1.1.tgz) = 00b21551a899bcfbaa7b8443e1faeef9
+SHA256 (gotoblas/lapack-3.1.1.tgz) = e4c335b30b4394f9620d60818319ff12af2aea63827515e9f7e62b88dff7a02a
+SIZE (gotoblas/lapack-3.1.1.tgz) = 10407595
+MD5 (gotoblas/large.tgz) = 5d138a84f302fd6804e4fab4b338cb18
+SHA256 (gotoblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
+SIZE (gotoblas/large.tgz) = 2595
+MD5 (gotoblas/timing.tgz) = 2025bee0fecccc792938978d857472f4
+SHA256 (gotoblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
+SIZE (gotoblas/timing.tgz) = 1059485
diff --git a/math/gotoblas/files/patch-Makefile b/math/gotoblas/files/patch-Makefile
new file mode 100644
index 000000000000..7b5218c677cf
--- /dev/null
+++ b/math/gotoblas/files/patch-Makefile
@@ -0,0 +1,27 @@
+--- Makefile.orig	2009-11-11 06:46:48.000000000 +0900
++++ Makefile	2010-02-02 10:44:34.000000000 +0900
+@@ -154,7 +154,7 @@
+ 	-@echo "NOOPT     = $(FFLAGS) -O0" >> lapack-3.1.1/make.inc
+ 	-@echo "PNOOPT     = $(FPFLAGS) -O0" >> lapack-3.1.1/make.inc
+ 	-@echo "LOADOPTS  = $(FFLAGS) $(EXTRALIB)" >> lapack-3.1.1/make.inc
+-	-@echo "ARCH      = $(AR)" >> lapack-3.1.1/make.inc
++	-@echo "ARCH_      = $(AR)" >> lapack-3.1.1/make.inc
+ 	-@echo "RANLIB    = $(RANLIB)" >> lapack-3.1.1/make.inc
+ 	-@echo "LAPACKLIB = ../$(LIBNAME)" >> lapack-3.1.1/make.inc
+ 	-@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> lapack-3.1.1/make.inc
+@@ -166,7 +166,7 @@
+ 
+ lapack-3.1.1 : lapack-3.1.1.tgz
+ ifndef NOFORTRAN
+-	@if test `$(MD5SUM) lapack-3.1.1.tgz | $(AWK) '{print $$1}'` = 00b21551a899bcfbaa7b8443e1faeef9; then \
++	@if test `$(MD5SUM) lapack-3.1.1.tgz | $(AWK) '{print $$4}'` = 00b21551a899bcfbaa7b8443e1faeef9; then \
+ 		echo $(TAR) zxf $< ;\
+ 		$(TAR) zxf $< && (cd lapack-3.1.1; $(PATCH) -p1 < ../patch.for_lapack-3.1.1) ;\
+ 	else \
+@@ -223,4 +223,4 @@
+ 	echo deleting lapack-3.1.1; \
+ 	rm -rf lapack-3.1.1 ;\
+ 	fi
+-	@echo Done.
+\ No newline at end of file
++	@echo Done.
diff --git a/math/gotoblas/files/patch-Makefile-exports b/math/gotoblas/files/patch-Makefile-exports
new file mode 100644
index 000000000000..302f10b05093
--- /dev/null
+++ b/math/gotoblas/files/patch-Makefile-exports
@@ -0,0 +1,28 @@
+--- exports/Makefile	2009-12-04 02:35:17.000000000 +0900
++++ exports/Makefile	2009-12-31 19:23:31.000000000 +0900
+@@ -161,13 +161,13 @@
+ 	rm -f goto.$(SUFFIX)
+ 
+ linux.def : gensymbol ../Makefile.system ../getarch.c
+-	./gensymbol linux $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F)
++	./gensymbol linux $(GARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F)
+ 
+ osx.def : gensymbol ../Makefile.system ../getarch.c
+-	./gensymbol osx $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F)
++	./gensymbol osx $(GARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F)
+ 
+ aix.def : gensymbol ../Makefile.system ../getarch.c
+-	./gensymbol aix $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F)
++	./gensymbol aix $(GARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F)
+ 
+ symbol.S : gensymbol
+ 	./gensymbol win2kasm noarch dummy $(EXPRECISION) $(NO_CBLAS) > symbol.S
+@@ -177,7 +177,7 @@
+ 	rm -f linktest
+ 
+ linktest.c : gensymbol ../Makefile.system ../getarch.c
+-	./gensymbol linktest  $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > linktest.c
++	./gensymbol linktest  $(GARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > linktest.c
+ 
+ clean ::
+ 	@rm -f *.def *.dylib __.SYMDEF*
diff --git a/math/gotoblas/files/patch-Makefile.rule b/math/gotoblas/files/patch-Makefile.rule
index 1ead9adf1199..c5b2ff6ab5d0 100644
--- a/math/gotoblas/files/patch-Makefile.rule
+++ b/math/gotoblas/files/patch-Makefile.rule
@@ -1,124 +1,15 @@
---- Makefile.rule.orig	2008-05-13 02:50:54.000000000 +0900
-+++ Makefile.rule	2008-06-14 13:27:28.000000000 +0900
-@@ -114,7 +114,7 @@
- MACHINE =
- OSNAME  =
- PGCPATH =
--ARCH =
-+GARCH =
- SUBARCH =
- ARCHSUBDIR =
- CONFIG =
-@@ -201,7 +201,7 @@
- endif
+--- Makefile.rule	2009-12-16 11:26:22.000000000 +0900
++++ Makefile.rule	2009-12-31 19:16:48.000000000 +0900
+@@ -14,10 +14,10 @@
  
- ifndef F_COMPILER
--F_COMPILER = G77
-+F_COMPILER = GFORTRAN
- I_DONT_HAVE_FC = 1
- endif
+ # C compiler including binary type(32bit / 64bit). Default is gcc.
+ # Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
+-# CC = gcc
++CC = %%CC%%
  
-@@ -245,7 +245,7 @@
- endif
+ # Fortran compiler. Default is g77.
+-# FC = gfortran
++FC = %%FC%%
  
- ifeq ($(C_COMPILER), GNU)
--COMPILER     = gcc
-+COMPILER     = %%CC%%
- CCOMMON_OPT += -Wall
- ifeq ($(SUPPORTED_DYNLIB), YES)
- CCOMMON_OPT += -fPIC 
-@@ -262,7 +262,7 @@
- endif
- 
- ifeq ($(C_COMPILER), INTEL)
--COMPILER     = icc
-+COMPILER     = %%CC%%
- ifeq ($(SUPPORTED_DYNLIB), YES)
- CCOMMON_OPT += -fPIC 
- endif
-@@ -294,7 +294,7 @@
- endif
- 
- ifeq ($(F_COMPILER), G77)
--COMPILER_F77 = g77
-+COMPILER_F77 = %%FC%%
- BU	     = _
- CCOMMON_OPT += -DF_INTERFACE_F2C -DNEED_F2CCONV
- FCOMMON_OPT += -Wall
-@@ -311,7 +311,7 @@
- endif
- 
- ifeq ($(F_COMPILER), G95)
--COMPILER_F77 = g95
-+COMPILER_F77 = %%FC%%
- BU	     = _
- CCOMMON_OPT += -DF_INTERFACE_F2C
- FCOMMON_OPT += -Wall #  -fno-underscoring
-@@ -328,10 +328,12 @@
- endif
- 
- ifeq ($(F_COMPILER), GFORTRAN)
--COMPILER_F77 = gfortran
-+COMPILER_F77 = %%FC%%
- BU	     = _
- CCOMMON_OPT += -DF_INTERFACE_GFORT
- FCOMMON_OPT += -Wall
-+GCCPATH = $(shell dirname `%%FC%% -print-libgcc-file-name`)
-+EXTRALIB    += -L$(GCCPATH)/../../../ -lgfortran
- ifeq ($(SUPPORTED_DYNLIB), YES)
- FCOMMON_OPT += -fPIC 
- endif
-@@ -349,7 +351,7 @@
- endif
- 
- ifeq ($(F_COMPILER), INTEL)
--COMPILER_F77 = ifort
-+COMPILER_F77 = %%FC%%
- BU	     = _
- CCOMMON_OPT += -DF_INTERFACE_F2C
- ifeq ($(SUPPORTED_DYNLIB), YES)
-@@ -404,7 +406,7 @@
- 
- ifneq ($(OSNAME), CYGWIN_NT)
- ifdef SMP
--EXTRALIB   += -lpthread
-+EXTRALIB   += ${PTHREAD_LIBS}
- endif
- endif
- 
-@@ -477,8 +479,8 @@
- GETARCH_SCRIPT	 = ./getarch
- endif
- 
--ifndef ARCH
--ARCH        := $(shell (cd $(TOPDIR); $(GETARCH_SCRIPT) 0 $(GETARCH_CC) $(GETARCH_FLAGS)))
-+ifndef GARCH
-+GARCH        := $(shell (cd $(TOPDIR); $(GETARCH_SCRIPT) 0 $(GETARCH_CC) $(GETARCH_FLAGS)))
- endif
- ifndef SUBARCH
- SUBARCH     := $(shell (cd $(TOPDIR); $(GETARCH_SCRIPT) 1 $(GETARCH_CC) $(GETARCH_FLAGS)))
-@@ -613,11 +615,11 @@
- endif
- 
- ifndef SMP
--LIBNAME		= $(LIBPREFIX)_$(LIBSUBARCH)$(REVISION).$(LIBSUFFIX)
--LIBNAME_P	= $(LIBPREFIX)_$(LIBSUBARCH)$(REVISION)_p.$(LIBSUFFIX)
-+LIBNAME		= $(LIBPREFIX)$(REVISION).a
-+LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.a
- else
--LIBNAME		= $(LIBPREFIX)_$(LIBSUBARCH)p$(REVISION).$(LIBSUFFIX)
--LIBNAME_P	= $(LIBPREFIX)_$(LIBSUBARCH)p$(REVISION)_p.$(LIBSUFFIX)
-+LIBNAME		= $(LIBPREFIX)p$(REVISION).a
-+LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.a
- endif
- 
- LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
-@@ -637,7 +639,7 @@
- export MACHINE
- export OSNAME
- export PGCPATH
--export ARCH
-+export GARCH
- export SUBARCH
- export ARCHSUBDIR
- export CONFIG
+ # Even you can specify cross compiler
+ # CC = x86_64-w64-mingw32-gcc
diff --git a/math/gotoblas/files/patch-Makefile.sparc b/math/gotoblas/files/patch-Makefile.sparc
deleted file mode 100644
index 2331ed5cefaf..000000000000
--- a/math/gotoblas/files/patch-Makefile.sparc
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.sparc~	Wed Feb  8 01:32:42 2006
-+++ Makefile.sparc	Fri Apr 20 10:50:57 2007
-@@ -16,7 +16,7 @@
- ifeq ($(COMPILER_F77), f90)
- FCOMMON_OPT += -xarch=v9
- endif
--LDFLAGS	= -64
-+LDFLAGS	=
- else
- 
- CCOMMON_OPT += -mcpu=v9
diff --git a/math/gotoblas/files/patch-Makefile.system b/math/gotoblas/files/patch-Makefile.system
new file mode 100644
index 000000000000..e54a3fc5d8e1
--- /dev/null
+++ b/math/gotoblas/files/patch-Makefile.system
@@ -0,0 +1,166 @@
+--- Makefile.system	2010-01-15 12:24:42.000000000 +0900
++++ Makefile.system	2010-02-01 15:16:00.000000000 +0900
+@@ -93,6 +93,10 @@
+ EXTRALIB	+= -lm
+ endif
+ 
++ifeq ($(OSNAME), FreeBSD)
++EXTRALIB	+= -lm
++endif
++
+ ifeq ($(OSNAME), AIX)
+ EXTRALIB	+= -lm
+ endif
+@@ -135,8 +139,8 @@
+ NO_EXPRECISION = 1
+ endif
+ 
+-ifneq ($(ARCH), x86)
+-ifneq ($(ARCH), x86_64)
++ifneq ($(GARCH), x86)
++ifneq ($(GARCH), x86_64)
+ NO_EXPRECISION = 1
+ endif
+ endif
+@@ -145,7 +149,7 @@
+ #  Architecture dependent settings
+ #
+ 
+-ifeq ($(ARCH), x86)
++ifeq ($(GARCH), x86)
+ ifndef BINARY
+ NO_BINARY_MODE	= 1
+ endif
+@@ -160,7 +164,7 @@
+ endif
+ endif
+ 
+-ifeq ($(ARCH), x86_64)
++ifeq ($(GARCH), x86_64)
+ ifndef NO_EXPRECISION
+ ifeq ($(F_COMPILER), GFORTRAN)
+ ifeq ($(C_COMPILER), GCC)
+@@ -201,12 +205,12 @@
+ 
+ 
+ ifdef DYNAMIC_ARCH
+-ifeq ($(ARCH), x86)
++ifeq ($(GARCH), x86)
+ DYNAMIC_CORE = KATMAI COPPERMINE NORTHWOOD PRESCOTT BANIAS \
+ 	       CORE2 PENRYN DUNNINGTON NEHALEM ATHLON OPTERON OPTERON_SSE3 BARCELONA ATOM NANO
+ endif
+ 
+-ifeq ($(ARCH), x86_64)
++ifeq ($(GARCH), x86_64)
+ DYNAMIC_CORE = PRESCOTT CORE2 PENRYN DUNNINGTON NEHALEM OPTERON OPTERON_SSE3 BARCELONA ATOM NANO
+ endif
+ 
+@@ -215,7 +219,7 @@
+ endif
+ endif
+ 
+-ifeq ($(ARCH), ia64)
++ifeq ($(GARCH), ia64)
+ NO_BINARY_MODE	= 1
+ BINARY_DEFINED	= 1
+ 
+@@ -227,11 +231,11 @@
+ endif
+ endif
+ 
+-ifeq ($(ARCH), mips64)
++ifeq ($(GARCH), mips64)
+ NO_BINARY_MODE	= 1
+ endif
+ 
+-ifeq ($(ARCH), alpha)
++ifeq ($(GARCH), alpha)
+ NO_BINARY_MODE	= 1
+ BINARY_DEFINED	= 1
+ endif
+@@ -247,7 +251,7 @@
+ 
+ ifdef NO_BINARY_MODE
+ 
+-ifeq ($(ARCH), mips64)
++ifeq ($(GARCH), mips64)
+ ifdef BINARY64
+ CCOMMON_OPT += -mabi=64
+ else
+@@ -320,7 +324,7 @@
+ CCOMMON_OPT += -DF_INTERFACE_GFORT
+ FCOMMON_OPT += -Wall 
+ ifdef NO_BINARY_MODE
+-ifeq ($(ARCH), mips64)
++ifeq ($(GARCH), mips64)
+ ifdef BINARY64
+ FCOMMON_OPT += -mabi=64
+ else
+@@ -399,7 +403,7 @@
+ endif
+ endif
+ 
+-ifneq ($(ARCH), mips64)
++ifneq ($(GARCH), mips64)
+ ifndef BINARY64
+ FCOMMON_OPT += -m32
+ else
+@@ -447,7 +451,7 @@
+ 
+ ifeq ($(C_COMPILER), SUN)
+ CCOMMON_OPT  += -w
+-ifeq ($(ARCH), x86)
++ifeq ($(GARCH), x86)
+ CCOMMON_OPT  += -m32
+ else
+ FCOMMON_OPT  += -m64
+@@ -499,7 +503,7 @@
+ ifdef SMP
+ CCOMMON_OPT	+= -DSMP_SERVER
+ 
+-ifeq ($(ARCH), mips64)
++ifeq ($(GARCH), mips64)
+ USE_SIMPLE_THREADED_LEVEL3 = 1
+ endif
+ 
+@@ -542,9 +546,9 @@
+ 
+ LIBPREFIX = libgoto2
+ 
+-KERNELDIR	= $(TOPDIR)/kernel/$(ARCH)
++KERNELDIR	= $(TOPDIR)/kernel/$(GARCH)
+ 
+-include $(TOPDIR)/Makefile.$(ARCH)
++include $(TOPDIR)/Makefile.$(GARCH)
+ 
+ CCOMMON_OPT	+= -DASMNAME=$(FU)$(*F) -DASMFNAME=$(FU)$(*F)$(BU) -DNAME=$(*F)$(BU) -DCNAME=$(*F) -DCHAR_NAME=\"$(*F)$(BU)\" -DCHAR_CNAME=\"$(*F)\"
+ 
+@@ -560,8 +564,8 @@
+ NO_AFFINITY = 1
+ endif
+ 
+-ifneq ($(ARCH), x86_64)
+-ifneq ($(ARCH), x86)
++ifneq ($(GARCH), x86_64)
++ifneq ($(GARCH), x86)
+ NO_AFFINITY = 1
+ endif
+ endif
+@@ -604,7 +608,7 @@
+ GREP	= grep
+ endif
+ 
+-MD5SUM	= md5sum
++MD5SUM	= md5
+ AWK	= awk
+ 
+ REVISION = -r$(VERSION)
+@@ -657,7 +661,7 @@
+ LIBS_P		= $(TOPDIR)/$(LIBNAME_P)
+ 
+ export OSNAME
+-export ARCH
++export GARCH
+ export CORE
+ export LIBCORE
+ export PGCPATH
diff --git a/math/gotoblas/files/patch-c_check b/math/gotoblas/files/patch-c_check
new file mode 100644
index 000000000000..c6eae695ef1c
--- /dev/null
+++ b/math/gotoblas/files/patch-c_check
@@ -0,0 +1,20 @@
+--- c_check~	2009-08-27 01:40:47.000000000 +0900
++++ c_check	2009-09-03 15:44:04.000000000 +0900
+@@ -2,7 +2,7 @@
+ 
+ # Checking cross compile
+ $hostos   = `uname -s | sed -e s/\-.*//`;    chop($hostos);
+-$hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch);
++$hostarch = `uname -m | sed -e s/i.86/x86/ | sed -e s/amd64/x86_64/` ;chop($hostarch);
+ 
+ $binary = $ENV{"BINARY"};
+
+@@ -143,7 +143,7 @@
+ # print $data, "\n";
+ 
+ print MAKEFILE "OSNAME=$os\n";
+-print MAKEFILE "ARCH=$architecture\n";
++print MAKEFILE "GARCH=$architecture\n";
+ print MAKEFILE "C_COMPILER=$compiler\n";
+ print MAKEFILE "BINARY32=\n" if $binformat ne bin32;
+ print MAKEFILE "BINARY64=\n" if $binformat ne bin64;
diff --git a/math/gotoblas/files/patch-export-Makefile b/math/gotoblas/files/patch-export-Makefile
deleted file mode 100644
index 1bbd7498cbc9..000000000000
--- a/math/gotoblas/files/patch-export-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- exports/Makefile.orig	Sun Jan 21 14:01:28 2007
-+++ exports/Makefile	Sun Jan 21 14:02:13 2007
-@@ -181,7 +181,7 @@
- 	./gensymbol win2kasm > symbol.S
- 
- test : linktest.c
--	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(EXTRALIB) -lm && echo OK.
-+	$(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -w -o linktest $(PTHREAD_LIBS) linktest.c ../$(LIBSONAME) $(EXTRALIB) -lm && echo OK.
- 	rm -f linktest
- 
- linktest.c : gensymbol ../Makefile.rule ../getarch.c
diff --git a/math/gotoblas/files/patch-exports+Makefile b/math/gotoblas/files/patch-exports+Makefile
new file mode 100644
index 000000000000..d4002f6b3a9d
--- /dev/null
+++ b/math/gotoblas/files/patch-exports+Makefile
@@ -0,0 +1,19 @@
+--- exports/Makefile	2010-02-01 12:54:01.000000000 +0900
++++ exports/Makefile	2010-02-01 14:03:25.000000000 +0900
+@@ -75,13 +75,13 @@
+ 	-Wl,--out-implib,libgoto2_shared.lib $(FEXTRALIB)
+ 
+ libgoto2.def : gensymbol
+-	./gensymbol win2k    $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F)
++	./gensymbol win2k    $(GARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F)
+ 
+ libgoto2_shared.def : gensymbol
+-	./gensymbol win2k    $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F)
++	./gensymbol win2k    $(GARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F)
+ 
+ libgoto_hpl.def : gensymbol
+-	./gensymbol win2khpl $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F)
++	./gensymbol win2khpl $(GARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F)
+ 
+ $(LIBDYNNAME) : ../$(LIBNAME) osx.def
+ 	$(PREFIX)gcc $(CFLAGS) -all_load -dynamiclib -o $(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def  $(FEXTRALIB)
diff --git a/math/gotoblas/files/patch-getarch b/math/gotoblas/files/patch-getarch
deleted file mode 100644
index 7b5cb9e0630f..000000000000
--- a/math/gotoblas/files/patch-getarch
+++ /dev/null
@@ -1,10 +0,0 @@
---- getarch.c~	2008-05-12 23:44:31.000000000 +0900
-+++ getarch.c	2008-06-14 13:20:54.000000000 +0900
-@@ -25,6 +25,7 @@
- #include <windows.h>
- #endif
- #if defined(__FreeBSD__) || defined(__APPLE__)
-+#include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
- 
diff --git a/math/gotoblas/files/patch-laswp+Makefile b/math/gotoblas/files/patch-laswp+Makefile
new file mode 100644
index 000000000000..96de0b4cd6b5
--- /dev/null
+++ b/math/gotoblas/files/patch-laswp+Makefile
@@ -0,0 +1,11 @@
+--- lapack/laswp/Makefile~	2009-07-20 23:53:13.000000000 +0900
++++ lapack/laswp/Makefile	2009-09-03 15:52:41.000000000 +0900
+@@ -16,7 +16,7 @@
+ qlaswp_plus.$(PSUFFIX) qlaswp_minus.$(PSUFFIX) \
+ claswp_plus.$(PSUFFIX) claswp_minus.$(PSUFFIX) zlaswp_plus.$(PSUFFIX) zlaswp_minus.$(PSUFFIX) \
+ xlaswp_plus.$(PSUFFIX) xlaswp_minus.$(PSUFFIX) : dummy
+-	cd $(ARCH) && $(MAKE) ../$(@F)
++	cd $(GARCH) && $(MAKE) ../$(@F)
+ 
+ include ../../Makefile.tail
+ 
diff --git a/math/gotoblas/files/patch-level1-asum-Makefile b/math/gotoblas/files/patch-level1-asum-Makefile
deleted file mode 100644
index 90ad52656408..000000000000
--- a/math/gotoblas/files/patch-level1-asum-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- level1/asum/Makefile.orig	2008-03-22 03:55:49.000000000 +0900
-+++ level1/asum/Makefile	2008-06-14 13:13:02.000000000 +0900
-@@ -8,7 +8,7 @@
- ZOBJS	= dzasumf.$(SUFFIX)
- XOBJS	= qxasumf.$(SUFFIX)
- 
--ifeq ($(ARCH), X86)
-+ifeq ($(GARCH), X86)
- SBLASOBJS	=  sasum.$(SUFFIX)
- DBLASOBJS	=  dasum.$(SUFFIX)
- QBLASOBJS	=  qasum.$(SUFFIX)
diff --git a/math/gotoblas/files/patch-level1-others-Makefile b/math/gotoblas/files/patch-level1-others-Makefile
deleted file mode 100644
index 3af3d56a441f..000000000000
--- a/math/gotoblas/files/patch-level1-others-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- level1/others/Makefile.orig	2008-04-03 10:18:18.000000000 +0900
-+++ level1/others/Makefile	2008-06-14 13:14:16.000000000 +0900
-@@ -23,7 +23,7 @@
- 
- LIBOTHERS = libothers.$(LIBSUFFIX)
- 
--ifeq ($(ARCH), X86)
-+ifeq ($(GARCH), X86)
- COMMONOBJS	+= cpuid.$(SUFFIX)
- endif
- 
-@@ -133,7 +133,7 @@
- 	cd $(ARCHSUBDIR) && $(MAKE) ../$(@F)
- endif
- 
--ifeq ($(ARCH), X86)
-+ifeq ($(GARCH), X86)
- cpuid.$(SUFFIX) cpuid.$(PSUFFIX) : dummy
- 	cd $(ARCHSUBDIR) && $(MAKE) ../$(@F)
- endif
diff --git a/math/gotoblas/files/patch-level3-Makefile b/math/gotoblas/files/patch-level3-Makefile
deleted file mode 100644
index 843a40c1fff1..000000000000
--- a/math/gotoblas/files/patch-level3-Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- level3/Makefile.orig	2008-03-22 03:56:03.000000000 +0900
-+++ level3/Makefile	2008-06-14 13:16:00.000000000 +0900
-@@ -1,7 +1,7 @@
- TOPDIR	= ..
- include ../Makefile.rule
- 
--ifeq ($(ARCH), ALPHA)
-+ifeq ($(GARCH), ALPHA)
- TRSMDIR	= oldtrsm
- TRMMDIR	= oldtrmm
- endif
-@@ -20,12 +20,12 @@
- 
- ALLSUBDIRS	= gemm trsm trmm symm syrk syr2k hemm herk her2k oldtrsm oldtrmm
- 
--ifeq ($(ARCH), X86_64)
-+ifeq ($(GARCH), X86_64)
- SUBDIRS    += gemm3m symm3m hemm3m
- ALLSUBDIRS += gemm3m symm3m hemm3m
- endif
- 
--ifeq ($(ARCH), IA64)
-+ifeq ($(GARCH), IA64)
- SUBDIRS    += gemm3m symm3m hemm3m
- ALLSUBDIRS += gemm3m symm3m hemm3m
- endif
diff --git a/math/gotoblas/files/patch-patch.for_lapack-3.1.1 b/math/gotoblas/files/patch-patch.for_lapack-3.1.1
new file mode 100644
index 000000000000..87477798efbe
--- /dev/null
+++ b/math/gotoblas/files/patch-patch.for_lapack-3.1.1
@@ -0,0 +1,171 @@
+--- patch.for_lapack-3.1.1.org	2010-02-02 11:11:11.000000000 +0900
++++ patch.for_lapack-3.1.1	2010-02-02 11:13:40.000000000 +0900
+@@ -30,7 +30,7 @@
+ diff -ruN lapack-3.1.1.old/SRC/Makefile lapack-3.1.1/SRC/Makefile
+ --- lapack-3.1.1.old/SRC/Makefile	2007-02-23 15:33:05.000000000 -0600
+ +++ lapack-3.1.1/SRC/Makefile	2009-12-16 14:41:09.000000000 -0600
+-@@ -38,265 +38,273 @@
++@@ -38,285 +38,294 @@
+  #
+  #######################################################################
+   
+@@ -531,17 +531,35 @@
+ +ALLOBJ_P = $(ALLOBJ:.$(SUFFIX)=.$(PSUFFIX))
+ +
+  ../$(LAPACKLIB): $(ALLOBJ)
+- 	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
+- 	$(RANLIB) $@
+- 
+-+../$(LAPACKLIB_P): $(ALLOBJ_P)
+-+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ_P)
++-	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
+++	$(ARCH_) $(ARCHFLAGS) $@ $(ALLOBJ)
+ +	$(RANLIB) $@
+ +
+++../$(LAPACKLIB_P): $(ALLOBJ_P)
+++	$(ARCH_) $(ARCHFLAGS) $@ $(ALLOBJ_P)
++ 	$(RANLIB) $@
++ 
+  single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
+- 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
++-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
+++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
+  	$(SCLAUX)
+-@@ -317,6 +325,7 @@
++ 	$(RANLIB) ../$(LAPACKLIB)
++ 
++ complex: $(CLASRC) $(ALLAUX) $(SCLAUX)
++-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ALLAUX) \
+++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ALLAUX) \
++ 	$(SCLAUX)
++ 	$(RANLIB) ../$(LAPACKLIB)
++ 
++ double: $(DLASRC) $(ALLAUX) $(DZLAUX)
++-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(ALLAUX) \
+++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(ALLAUX) \
++ 	$(DZLAUX)
++ 	$(RANLIB) ../$(LAPACKLIB)
++ 
++ complex16: $(ZLASRC) $(ALLAUX) $(DZLAUX)
++-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ALLAUX) \
+++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ALLAUX) \
+  	$(DZLAUX)
+  	$(RANLIB) ../$(LAPACKLIB)
+  
+@@ -570,115 +588,4 @@
+  
+ +slaruv.$(PSUFFIX): slaruv.f ; $(FORTRAN) $(PNOOPT) -O0 -c $< -o $@
+ +dlaruv.$(PSUFFIX): dlaruv.f ; $(FORTRAN) $(PNOOPT) -O0 -c $< -o $@
+-diff -ruN lapack-3.1.1.old/TESTING/EIG/Makefile lapack-3.1.1/TESTING/EIG/Makefile
+---- lapack-3.1.1.old/TESTING/EIG/Makefile	2007-02-20 15:33:03.000000000 -0600
+-+++ lapack-3.1.1/TESTING/EIG/Makefile	2009-12-16 14:40:35.000000000 -0600
+-@@ -78,7 +78,7 @@
+-    cget35.o cget36.o cget37.o cget38.o cget51.o cget52.o \
+-    cget54.o cglmts.o cgqrts.o cgrqts.o cgsvts.o \
+-    chbt21.o chet21.o chet22.o chpt21.o chst01.o \
+--   clarfy.o clarhs.o clatm4.o clctes.o clctsx.o clsets.o csbmv.o \
+-+   clarfy.o clarhs.o clatm4.o clctes.o clctsx.o clsets.o \
+-    csgt01.o cslect.o \
+-    cstt21.o cstt22.o cunt01.o cunt03.o
+- 
+-@@ -115,7 +115,7 @@
+-    zget35.o zget36.o zget37.o zget38.o zget51.o zget52.o \
+-    zget54.o zglmts.o zgqrts.o zgrqts.o zgsvts.o \
+-    zhbt21.o zhet21.o zhet22.o zhpt21.o zhst01.o \
+--   zlarfy.o zlarhs.o zlatm4.o zlctes.o zlctsx.o zlsets.o zsbmv.o \
+-+   zlarfy.o zlarhs.o zlatm4.o zlctes.o zlctsx.o zlsets.o \
+-    zsgt01.o zslect.o \
+-    zstt21.o zstt22.o zunt01.o zunt03.o
+- 
+-@@ -129,22 +129,22 @@
+- ../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ; \
+-           $(LOADER) $(LOADOPTS) -o $@ \
+-           $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
+--	  ../../$(LAPACKLIB) $(BLASLIB)
+-+	  ../../$(LAPACKLIB) $(BLASLIB) $(CEXTRALIB)
+- 
+- ../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST) ; \
+-           $(LOADER) $(LOADOPTS) -o $@ \
+-           $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
+--	  ../../$(LAPACKLIB) $(BLASLIB)
+-+	  ../../$(LAPACKLIB) $(BLASLIB) $(CEXTRALIB)
+- 
+- ../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) ; \
+-           $(LOADER) $(LOADOPTS) -o $@ \
+-           $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
+--	  ../../$(LAPACKLIB) $(BLASLIB)
+-+	  ../../$(LAPACKLIB) $(BLASLIB) $(CEXTRALIB)
+- 
+- ../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) ; \
+-           $(LOADER) $(LOADOPTS) -o $@ \
+-           $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
+--	  ../../$(LAPACKLIB) $(BLASLIB)
+-+	  ../../$(LAPACKLIB) $(BLASLIB) $(CEXTRALIB)
+- 
+- $(AEIGTST): $(FRC)
+- $(SCIGTST): $(FRC)
+-diff -ruN lapack-3.1.1.old/TESTING/LIN/Makefile lapack-3.1.1/TESTING/LIN/Makefile
+---- lapack-3.1.1.old/TESTING/LIN/Makefile	2007-02-20 15:33:03.000000000 -0600
+-+++ lapack-3.1.1/TESTING/LIN/Makefile	2009-12-16 14:40:35.000000000 -0600
+-@@ -97,7 +97,7 @@
+-    cqpt01.o cqrt01.o cqrt02.o cqrt03.o cqrt11.o \
+-    cqrt12.o cqrt13.o cqrt14.o cqrt15.o cqrt16.o \
+-    cqrt17.o crqt01.o crqt02.o crqt03.o crzt01.o crzt02.o \
+--   csbmv.o  cspt01.o \
+-+   cspt01.o \
+-    cspt02.o cspt03.o csyt01.o csyt02.o csyt03.o \
+-    ctbt02.o ctbt03.o ctbt05.o ctbt06.o ctpt01.o \
+-    ctpt02.o ctpt03.o ctpt05.o ctpt06.o ctrt01.o \
+-@@ -159,7 +159,7 @@
+-    zqpt01.o zqrt01.o zqrt02.o zqrt03.o zqrt11.o \
+-    zqrt12.o zqrt13.o zqrt14.o zqrt15.o zqrt16.o \
+-    zqrt17.o zrqt01.o zrqt02.o zrqt03.o zrzt01.o zrzt02.o \
+--   zsbmv.o  zspt01.o \
+-+   zspt01.o \
+-    zspt02.o zspt03.o zsyt01.o zsyt02.o zsyt03.o \
+-    ztbt02.o ztbt03.o ztbt05.o ztbt06.o ztpt01.o \
+-    ztpt02.o ztpt03.o ztpt05.o ztpt06.o ztrt01.o \
+-@@ -176,7 +176,7 @@
+- 	zdrvab.o zerrab.o zget08.o          \
+- 	alaerh.o alahd.o  aladhd.o alareq.o \
+- 	chkxer.o zget02.o zlarhs.o zlatb4.o \
+--	zsbmv.o  xerbla.o
+-+	xerbla.o
+- 
+- all:  single double complex complex16 proto-double proto-complex16
+- 
+-@@ -190,27 +190,27 @@
+- 
+- ../xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST)
+- 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(SLINTST) \
+--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@
+-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@ $(CEXTRALIB)
+- 
+- ../xlintstc : $(ALINTST) $(CLINTST) $(SCLNTST)
+- 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(CLINTST) \
+--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@
+-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@ $(CEXTRALIB)
+-  
+- ../xlintstd : $(ALINTST) $(DLINTST) $(DZLNTST)
+- 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(DZLNTST) $(DLINTST) \
+--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@
+-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@ $(CEXTRALIB)
+-  
+- ../xlintstz : $(ALINTST) $(ZLINTST) $(DZLNTST)
+- 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(DZLNTST) $(ZLINTST) \
+--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@
+-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@ $(CEXTRALIB)
+-  
+- ../xlintstds : $(DSLINTST)
+- 	$(LOADER) $(LOADOPTS)  $(DSLINTST) \
+--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@
+-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@ $(CEXTRALIB)
+-  
+- ../xlintstzc : $(ZCLINTST)
+- 	$(LOADER) $(LOADOPTS)  $(ZCLINTST) \
+--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@
+-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)  -o $@ $(CEXTRALIB)
+-  
+- $(ALINTST): $(FRC)
+- $(SCLNTST): $(FRC)
++
diff --git a/math/gotoblas/pkg-descr b/math/gotoblas/pkg-descr
index 1d0a830b4dbb..857975d0fc33 100644
--- a/math/gotoblas/pkg-descr
+++ b/math/gotoblas/pkg-descr
@@ -1,5 +1,6 @@
-The GotoBLAS codes are currently the fastest implementations
-of the Basic Linear Algebra Subroutines(BLAS; math/blas).
-It supports various architectures.
+GotoBLAS2 is a fast implementation of Basic Linear Algebra
+Subprograms. It supports various architectures and is optimized
+for many cores, including Intel Nehalem and Atom, Via Nano,
+SiCortex, AMD Shanghai and Istanbul.
 
-WWW: http://www.tacc.utexas.edu/resources/software/
+WWW: http://www.tacc.utexas.edu/tacc-projects/