plplot: Update to 5.11.0 (WIP)

mingw-w64-plplot/PKGBUILD

@@ -2,32 +2,30 @@
 # Contributor: Jürgen Pfeifer <juergen@familiepfeifer.de>
 
 _realname=plplot
-
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=5.10.0
+pkgver=5.11.0
 pkgrel=1
 arch=('any')
 pkgdesc="Scientific plotting software (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-    "${MINGW_PACKAGE_PREFIX}-gcc-fortran"
-    "${MINGW_PACKAGE_PREFIX}-gcc-ada"
-    "${MINGW_PACKAGE_PREFIX}-freetype"
-    "${MINGW_PACKAGE_PREFIX}-tk"
-    "${MINGW_PACKAGE_PREFIX}-wxWidgets"
-    "${MINGW_PACKAGE_PREFIX}-lua"
-    "${MINGW_PACKAGE_PREFIX}-python2"
-    "${MINGW_PACKAGE_PREFIX}-python2-numpy"
-    "${MINGW_PACKAGE_PREFIX}-qhull")
-makedepends=("subversion"
-    "${MINGW_PACKAGE_PREFIX}-cmake"
-    "${MINGW_PACKAGE_PREFIX}-gcc-fortran"
-    "${MINGW_PACKAGE_PREFIX}-gcc-ada")
+         "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran"
+         "${MINGW_PACKAGE_PREFIX}-freetype"
+         "${MINGW_PACKAGE_PREFIX}-lua"
+         "${MINGW_PACKAGE_PREFIX}-python2"
+         "${MINGW_PACKAGE_PREFIX}-python2-numpy"
+         "${MINGW_PACKAGE_PREFIX}-qhull"
+         "${MINGW_PACKAGE_PREFIX}-tk"
+         "${MINGW_PACKAGE_PREFIX}-wxWidgets"
+        )
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-gcc-fortran"
+             "${MINGW_PACKAGE_PREFIX}-gcc-ada")
 options=('strip' 'staticlibs')
 license=('LGPL')
-url="http://svn.code.sf.net/p/plplot"
+url="http://plplot.sourceforge.net"
 source=(http://downloads.sourceforge.net/sourceforge/plplot/${_realname}-${pkgver}.tar.gz
-    find-gd.patch)
-sha1sums=('ea962cb0138c9b4cbf97ecab1fac1919ea0f939f'
+        find-gd.patch)
+sha1sums=('215c60b86ae1381813e5c837ea6afa6d7708127d'
           '7800cad653ebcedf596a01e545116f6ffd04f0f9')
 
 prepare() {
@@ -36,15 +34,6 @@ prepare() {
 }
 
 build() {
-  mkdir -p ${pkgdir}${MINGW_PREFIX}
-  pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
-    export PREFIX_WIN=`pwd -W`
-  popd > /dev/null
-
-  pushd ${MINGW_PREFIX} > /dev/null
-    export PREFIX_DEPS=`pwd -W`
-  popd > /dev/null
-
   # cmake's FindSWIG doesn't work properly on MSYS,
   # so we provide SWIG here
   SWIG_EXECUTABLE_U=`type -p swig`
@@ -55,23 +44,24 @@ build() {
   # cmake may be confused if there is a Windows installation
   # of the official Python MSI. Please do the Python-enabled
   # build only, if no official Python is installed.
-  cd "$srcdir"
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [ -d ${srcdir}/build-${MINGW_CHOST} ] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
 
   ${MINGW_PREFIX}/bin/cmake \
     -G "MSYS Makefiles" \
-    -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \
+    -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${MINGW_PREFIX} \
     -DCMAKE_Fortran_COMPILER:PATH=${MINGW_PREFIX}/bin/gfortran.exe \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=ON \
     -DBUILD_TESTING=OFF \
     -DSWIG_EXECUTABLE="${SWIG_EXECUTABLE}" \
     -DSWIG_DIR="${SWIG_DIR}" \
-    -DQHULL_INCLUDE_DIR=${PREFIX_DEPS}/include \
-    -DGD_INCLUDE_DIR=${PREFIX_DEPS}/include \
+    -DQHULL_INCLUDE_DIR=${MINGW_PREFIX}/include \
+    -DGD_INCLUDE_DIR=${MINGW_PREFIX}/include \
     -DENABLE_lua=ON \
     -DENABLE_python=ON \
     ../${_realname}-${pkgver}
+
   make V=1
 }