Updating to release 3.2.0

1 files changed, 46 insertions, 29 deletions

diff --git a/PKGBUILD b/PKGBUILD
index af766f3a99b7..c3ba6e740378 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,42 @@
 # Maintainer: mickele
 #Contributor: nema.arpit
 pkgname=opensees
-pkgver=2.5.0
-pkgrel=2
+pkgver=3.2.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/"
-depends=('tk>=8.6' 'openssl' 'libpng' 'mesa' 'lapack' 'mumps4' 'glu' 'openmpi')
-makedepends=('svn' 'gcc-fortran')
+url="https://github.com/OpenSees/OpenSees"
+depends=('tcl>=8.6' 'openssl' 'libpng' 'mesa' 'lapack' 'mumps' 'glu' 'openmpi' 'python')
+makedepends=('git' 'gcc-fortran' 'gcc')
 options=()
 license=("custom")
 
-# source=("http://opensees.berkeley.edu/OpenSees/code/OpenSees${pkgver}.tar.gz" "Makefile.def")
-
-# This release is available only through svn
-# http://opensees.berkeley.edu/OpenSees/changeLog.php
-source=("Makefile.def" "png-miss-header.patch" "min-max-conflict.patch" "steeldr.f-bug.patch")
+# source=("https://github.com/OpenSees/OpenSees/archive/v${pkgver}.tar.gz" "Makefile.def")
+source=("Makefile.def" "MPMakeFile.patch")
 
 # _svntrunk="svn://opensees.berkeley.edu/usr/local/svn/OpenSees/trunk"
-_svntrunk="svn://peera.berkeley.edu/usr/local/svn/OpenSees/trunk"
-_svnrel="6236"
-_svnmod="OpenSees"
+_gitrepo="https://github.com/OpenSees/OpenSees.git"
+_gitrel="fb2159f0ea91a0b1703ec4bd8abebb49ad158fa2"
+_gitmod="OpenSees"
 _installdir="/usr"
 
 prepare() {
   cd "${srcdir}"
 
-  msg "Starting SVN checkout..."
-  if [ -d ${_svnmod}/.svn ]; then
-      (cd ${_svnmod} && svn up -r ${_svnrel})
-    else
-      svn co ${_svntrunk} --config-dir ./ -r ${_svnrel} ${_svnmod}
+  msg "Starting GIT checkout..."
+  msg "${srcdir}"
+  if [ -d ${srcdir}/${_gitmod}/.git ]; then
+    (echo 'Copy of repository exists')
+  else
+    (git clone ${_gitrepo})
   fi
+  cd OpenSees
+  git checkout ${_gitrel}
+  git checkout -- .
+
   msg "SVN checkout done or server timeout"
 
-  cd "${srcdir}/${_svnmod}"
+  cd "${srcdir}/${_gitmod}"
 
   msg "Configuring..."
   cp "${srcdir}/Makefile.def" ./ || return 1
@@ -43,48 +45,63 @@ prepare() {
       -i Makefile.def
 
   msg "Patching..."
+  git apply "${srcdir}/MPMakeFile.patch"
   # Missing header
   # error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
-  svn patch "${srcdir}/png-miss-header.patch"
+#  svn patch "${srcdir}/png-miss-header.patch"
   
   # Patch DistributedSuperLu.cpp to avoid min max macro conflict
   # between f2c.h and stl_algobase.h in gcc6
-  svn patch "${srcdir}/min-max-conflict.patch"
+#  svn patch "${srcdir}/min-max-conflict.patch"
   
   # Fix STEELDR.f, potential bug in ShellMITC4.cpp
-  svn patch "${srcdir}/steeldr.f-bug.patch"
+#  svn patch "${srcdir}/steeldr.f-bug.patch"
 }
 
 build() {
-  cd "${srcdir}/${_svnmod}"
+  cd "${srcdir}/${_gitmod}"
 
   msg "Building OpenSees..."
   mkdir -p "${srcdir}/lib"
   mkdir -p "${srcdir}/bin"
   make wipe
+  make clean
   make
   
+  msg "Building OpenSees Python Module"
+  
+  cd "${srcdir}/${_gitmod}/SRC/interpreter"
+  make pythonmodule
+  cp opensees.so "${srcdir}/bin"
+  
+  cd "${srcdir}/${_gitmod}"
+  
   msg "Building OpenSeesMP..."
   make wipe
+  make clean
   make "OpenSees_PROGRAM = ${srcdir}/bin/OpenSeesMP" "PROGRAMMING_MODE = PARALLEL_INTERPRETERS"
   
   msg "Building OpenSeesSP..."
   make wipe
+  make clean
   make "OpenSees_PROGRAM = ${srcdir}/bin/OpenSeesSP" "PROGRAMMING_MODE = PARALLEL"
 }
 
 package(){
-  msg "Istalling binary..."
+  msg "Installing binaries..."
+  _pylibdir=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+  
   install -d -m755 "${pkgdir}${_installdir}/bin"
   install "${srcdir}/bin/OpenSees" "${pkgdir}${_installdir}/bin"
   install "${srcdir}/bin/OpenSeesMP" "${pkgdir}${_installdir}/bin"
   install "${srcdir}/bin/OpenSeesSP" "${pkgdir}${_installdir}/bin"
+  
+  install -d -m755 "${pkgdir}${_pylibdir}"
+  install "${srcdir}/bin/opensees.so" "${pkgdir}${_pylibdir}"
 
-  msg "Istalling licence..."
+  msg "Installing license..."
   install -D -m644 "${srcdir}/OpenSees/COPYRIGHT" \
 	"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-md5sums=('cfcbd913cf332951aa326614e161fee3'
-         'b8f21b0e77db6338fd6550ba3aaf8057'
-         '2e451d6e144b0e1a61e4efe622ef39b0'
-         'b572eee6bfd3ca03c2e541cdb1dcfcc7')
+md5sums=('bcf43c4fcac86daf72659b723d88eb63'
+         '6193c6e9f12912d04497b7b2a9c412ab')