Bump version to 4.0

3 files changed, 50 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9b35baee79c..2f0dbf7afebe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,16 @@
-# Generated by mksrcinfo v8
-# Thu May  5 22:51:33 UTC 2016
 pkgbase = tfel
 	pkgdesc = TFEL/MFront introduces DSLs based on C++ to handle material knowledge
-	pkgver = 2.0.3
+	pkgver = 4.0
 	pkgrel = 1
-	url = http://tfel.sourceforge.net/
-	arch = i686
+	url = https://github.com/thelfer/TFEL
 	arch = x86_64
-	license = gpl
+	license = GPL3
 	makedepends = cmake
+	makedepends = gcc-fortran
+	depends = gcc-libs
+	depends = gnuplot
 	provides = mfront
-	source = http://downloads.sourceforge.net/sourceforge/tfel/tfel-2.0.3.tar.bz2
-	source = cmake-3.5.patch
-	md5sums = 7c0a2fd1ad2c721682a2cdf267aff145
-	md5sums = e4ade3562af07f05f0575162d119b8d9
+	source = https://github.com/thelfer/TFEL/archive/TFEL-4.0.tar.gz
+	sha512sums = baf10c4dbad10e84e5e1334c106c0f13a5c7d993adf95e6053cc1f4f418a2f6a4bcd19a45957910e7e1eed0e69aeb09499fda24c4d3c9b5d0b343b0e1b6e7883
 
 pkgname = tfel
-
diff --git a/PKGBUILD b/PKGBUILD
index 7e44e669b7ed..c6a08311f11b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,51 @@
-# Maintainer: mickele
-pkgname=tfel
-pkgver=2.0.3
+# Maintainer: Carlos Aznarán <caznaranl@uni.pe>
+# Contributor: Michele Mocciola <mimocciola@yahoo.com>
+_base=TFEL
+pkgname=${_base,,}
+pkgver=4.0
 pkgrel=1
 pkgdesc="TFEL/MFront introduces DSLs based on C++ to handle material knowledge"
-arch=('i686' 'x86_64')
-url="http://tfel.sourceforge.net/"
-license=('gpl')
-depends=()
-provides=('mfront')
-makedepends=('cmake')
+arch=(x86_64)
+url="https://github.com/thelfer/${_base}"
+license=(GPL3)
+depends=(gcc-libs gnuplot)
+provides=(mfront)
+makedepends=(cmake gcc-fortran)
 optdepends=()
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "cmake-3.5.patch")
-
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    patch -Np1 -i "${srcdir}/cmake-3.5.patch"
-}
+source=(${url}/archive/${_base}-${pkgver}.tar.gz)
+sha512sums=('baf10c4dbad10e84e5e1334c106c0f13a5c7d993adf95e6053cc1f4f418a2f6a4bcd19a45957910e7e1eed0e69aeb09499fda24c4d3c9b5d0b343b0e1b6e7883')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-
-   mkdir -p build
-   cd build
-
-   cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release -Denable-fortran=ON -Denable-aster=ON .. 
-
-   make
+  cmake \
+    -S ${pkgname}-${_base}-${pkgver} \
+    -B build \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -Denable-python=OFF \
+    -Denable-python-bindings=OFF \
+    -Denable-fortran=ON \
+    -Denable-aster=ON \
+    -Denable-abaqus=ON \
+    -Denable-ansys=ON \
+    -Denable-europlexus=ON \
+    -Denable-zmat=ON \
+    -Denable-cyrano=ON \
+    -Denable-calculix=ON \
+    -Denable-comsol=ON \
+    -Denable-diana-fea=ON \
+    -Denable-lsdyna=ON \
+    -Denable-cxx-17=ON \
+    -Denable-reference-doc=OFF \
+    -Wno-dev
+  cmake --build build --target all
 }
 
+# check() {
+#   # cmake --build build --target check
+#   LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${srcdir}/build/lib/" ctest --verbose --output-on-failure --test-dir build
+# }
+
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}/build"
-   
-   make DESTDIR=${pkgdir} install
+  DESTDIR="${pkgdir}" cmake --build build --target install
+  install -Dm 644 ${pkgname}-${_base}-${pkgver}/LICENCE-GNU-GPL -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
-
-md5sums=('7c0a2fd1ad2c721682a2cdf267aff145'
-         'e4ade3562af07f05f0575162d119b8d9')
diff --git a/cmake-3.5.patch b/cmake-3.5.patch
deleted file mode 100644
index 9b5c0c7dd442..000000000000
--- a/cmake-3.5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tfel-2.0.3.orig/cmake/modules/gnu-fortran-compiler.cmake tfel-2.0.3/cmake/modules/gnu-fortran-compiler.cmake
---- tfel-2.0.3.orig/cmake/modules/gnu-fortran-compiler.cmake	2016-05-06 00:33:55.609734905 +0200
-+++ tfel-2.0.3/cmake/modules/gnu-fortran-compiler.cmake	2016-05-06 00:41:03.800748528 +0200
-@@ -1,11 +1,15 @@
- get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME)
- if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
-   set(GNU_FORTRAN_COMPILER ON)
--  if(MSYS OR APPLE OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD"))
--    add_definitions("-D'F77_FUNC(X,Y)=X##_' -D'F77_FUNC_(X,Y)=X##_'")
--  else(MSYS OR APPLE OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD"))
-+  if(CMAKE_VERSION)
-+    if(CMAKE_VERSION VERSION_GREATER 3.1)
-+      add_definitions("-D'F77_FUNC(X,Y)=X##_' -D'F77_FUNC_(X,Y)=X##_'")
-+    else(CMAKE_VERSION VERSION_GREATER 3.1)
-+      add_definitions("-D'F77_FUNC(X,Y)=X\\#\\#_' -D'F77_FUNC_(X,Y)=X\\#\\#_'")
-+    endif(CMAKE_VERSION VERSION_GREATER 3.1)
-+  else(CMAKE_VERSION)
-     add_definitions("-D'F77_FUNC(X,Y)=X\\#\\#_' -D'F77_FUNC_(X,Y)=X\\#\\#_'")
--  endif(MSYS OR APPLE OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD"))
-+  endif(CMAKE_VERSION)
- else("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
-   message(FATAL_ERROR "unsupported fortran compiler ${Fortran_COMPILER_NAME}")
- endif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
-\ No newline at end of file