Updated to version 2.5.0

3 files changed, 24 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e9e9b5310ba..a74ba2a2aa88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Feb 17 14:06:47 UTC 2016
+# Tue May  3 21:39:13 UTC 2016
 pkgbase = opensees
 	pkgdesc = OpenSees, a software framework for developing applications to simulate the performance of structural and geotechnical systems subjected to earthquakes
-	pkgver = 2.4.6
-	pkgrel = 2
+	pkgver = 2.5.0
+	pkgrel = 1
 	url = http://opensees.berkeley.edu/
 	arch = i686
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = opensees
 	depends = mesa
 	depends = lapack
 	source = Makefile.def
-	md5sums = 51bd92d2ef7acf6777c4ad48c8fa7cb3
+	md5sums = ef90aba7305b6c5de948df9c5ba43df6
 
 pkgname = opensees
 
diff --git a/Makefile.def b/Makefile.def
index c608b51f6d55..d2cae4e20c2c 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -8,6 +8,7 @@
 #
 #  Written: mickele
 #  Created: 12/2014
+#  Last modified: 05/2016
 #
 #  Send bug reports, comments or suggestions to
 #  https://aur.archlinux.org/packages/opensees/
@@ -71,16 +72,13 @@ SRCdir       = $(HOME)/OpenSees/SRC
 ifeq ($(PROGRAMMING_MODE), THREADS)
     SUPERLUdir   = $(HOME)/OpenSees/OTHER/SuperLU_MT
 else
-    SUPERLUdir   = $(HOME)/OpenSees/OTHER/SuperLU_4.1/SRC
+    SUPERLUdir   = $(HOME)/OpenSees/OTHER/SuperLU_5.0/SRC
 endif
-SUPERLU_DISTdir   = $(HOME)/OpenSees/OTHER/SuperLU_DIST_2.5/SRC
+# SUPERLU_DISTdir   = $(HOME)/OpenSees/OTHER/SuperLU_DIST_2.5/SRC
 
 
-# DIRS        = $(AMDdir) $(BLASdir) $(CBLASdir) $(LAPACKdir) \
-# 	$(SUPERLUdir) $(ARPACKdir) $(UMFPACKdir) $(SRCdir) $(METISdir)
-# DIRS        = $(AMDdir) $(SUPERLUdir) $(ARPACKdir) $(UMFPACKdir) $(SRCdir) $(CSPARSEdir)
-DIRS        = $(BLASdir) $(CBLASdir) $(LAPACKdir) $(AMDdir) $(CSPARSEdir) \
-	$(SUPERLUdir) $(ARPACKdir) $(UMFPACKdir) $(SRCdir) $(METISdir)
+DIRS = $(BLASdir) $(CBLASdir) $(LAPACKdir) $(AMDdir) $(CSPARSEdir) \
+       $(SUPERLUdir) $(ARPACKdir) $(UMFPACKdir) $(SRCdir) $(METISdir)
 
 # %-------------------------------------------------------%
 # | SECTION 4: LIBRARIES                                  |
@@ -118,11 +116,10 @@ BLITZ_LIBRARY   =
 AMD_LIBRARY     = $(HOME)/lib/libAmd.a
 
 ifeq ($(GRAPHICS), UsingOpenGL)
-    GRAPHIC_LIBRARY = -lGL -lX11 -lXext -lGLU
+  GRAPHIC_LIBRARY = -lGL -lGLU -lX11
 else
   ifeq ($(GRAPHICS), UsingX11)
-      GRAPHIC_LIBRARY = /usr/lib/libX11.a
-  else
+      GRAPHIC_LIBRARY = -lX11
   endif
 endif
 
@@ -178,6 +175,8 @@ ifeq ($(GRAPHICS), UsingOpenGL)
 else
     ifeq ($(GRAPHICS), UsingX11)
         GRAPHIC_FLAG = -D_X11
+    else
+        GRAPHIC_FLAG = -D_NOGRAPHICS
     endif
 endif
 
@@ -360,7 +359,7 @@ MACHINE_NUMERICAL_LIBS  = $(RELIABILITY_LIBRARY) -lm \
 			  $(GRAPHIC_LIBRARY) $(OPTIMIZATION_LIBRARY) \
 			  $(AMD_LIBRARY) \
 			  $(CSPARSE_LIBRARY) \
-			  -ldl -lgfortran -lpng -lssl
+			  -ldl -lgfortran -lpng
 
 ifeq ($(PROGRAMMING_MODE), SEQUENTIAL)
      PARALLEL_LIB = 
@@ -390,13 +389,15 @@ endif
 MACHINE_INCLUDES = -I/usr/include \
                    -I$(BASE)/include \
 		   -I/usr/include/cxx \
-		   -I$(SUPERLU_DISTdir) $(MUMPS_INCLUDE) \
-		   -I$(HOME)/include -I$(HOME)/blitz \
-		   -I$(UMFPACKdir) -I$(SUPERLUdir)
+		   $(MUMPS_INCLUDE) \
+		   -I$(HOME)/include \
+		   -I$(HOME)/blitz \
+		   -I$(UMFPACKdir) \
+		   -I$(SUPERLUdir)
 
 # this file contains all the OpenSees/SRC includes
 include $(FE)/Makefile.incl
 
-TCL_INCLUDES = 
+TCL_INCLUDES =
 
 INCLUDES = $(TCL_INCLUDES) $(FE_INCLUDES) $(MACHINE_INCLUDES)
diff --git a/PKGBUILD b/PKGBUILD
index b59c454b6f17..b356c2325dc8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: mickele
 pkgname=opensees
-pkgver=2.4.6
-pkgrel=2
+pkgver=2.5.0
+pkgrel=1
 pkgdesc="OpenSees, a software framework for developing applications to simulate the performance of structural and geotechnical systems subjected to earthquakes"
 arch=("i686" "x86_64")
 url="http://opensees.berkeley.edu/"
@@ -17,7 +17,7 @@ source=("Makefile.def")
 
 # _svntrunk="svn://opensees.berkeley.edu/usr/local/svn/OpenSees/trunk"
 _svntrunk="svn://peera.berkeley.edu/usr/local/svn/OpenSees/trunk"
-_svnrel="6016"
+_svnrel="6236"
 _svnmod="OpenSees"
 _installdir="/usr"
 
@@ -65,4 +65,4 @@ package(){
   install -D -m644 "${srcdir}/OpenSees/COPYRIGHT" \
 	"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-md5sums=('51bd92d2ef7acf6777c4ad48c8fa7cb3')
+md5sums=('ef90aba7305b6c5de948df9c5ba43df6')