Lates 2016 dataplot version

2 files changed, 61 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2216011a4d67..498710b3b04e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
+# Generated by mksrcinfo v8
+# Sun Dec 25 11:44:28 UTC 2016
 pkgbase = dataplot
 	pkgdesc = Software for scientific visualization, statistical analysis, and non-linear modeling.
-	pkgver = 2009_08_21
-	pkgrel = 4
+	pkgver = 2016_12_09
+	pkgrel = 1
 	url = http://www.itl.nist.gov/div898/software/dataplot.html/
 	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = imagemagick
 	makedepends = gcc-fortran
+	makedepends = gendesk
 	depends = gd
 	depends = gcc-libs
 	depends = fontconfig
@@ -18,19 +21,18 @@ pkgbase = dataplot
 	depends = libx11
 	depends = freetype2
 	depends = tcsh
-	noextract = dpsrc_2009_08_21.tar.gz
-	noextract = dplib.2009_08_21.tar.gz
+	depends = readline
+	depends = termcap
+	depends = tk
+	noextract = dpsrc_2016_12_09.tar.gz
+	noextract = dplib.tar.gz
 	backup = usr/share/dataplot/frscript/xdpConfig
-	source = ftp://ftp.nist.gov/pub/dataplot/unix/dpsrc_2009_08_21.tar.gz
-	source = ftp://ftp.nist.gov/pub/dataplot/unix/dplib.2009_07_15.tar.gz
-	source = ftp://ftp.nist.gov/pub/dataplot/unix/dataplot_command.2009_06_21.tar.gz
+	source = http://www.itl.nist.gov/div898/software/dataplot/ftp/unix/dpsrc_2016_12_09.tar.gz
+	source = http://www.itl.nist.gov/div898/software/dataplot/ftp/unix/dplib.tar.gz
 	source = dataplot.sh
-	source = xdataplot.desktop
-	md5sums = d69caec4a853043dc6c4390da61cc34f
-	md5sums = 6f978d7df658207bf64a08c1edb57b6b
-	md5sums = ba4d5a06ca69fa8878c559f4ad6ba73b
+	md5sums = b46dcb3b49487da6ab1d4989f6b84739
+	md5sums = 0d0c534cf995c1b1119d9437835de068
 	md5sums = d212f5842a9bab712d6353dbb66198d8
-	md5sums = 5cd4b7779bbfb926bf9daf27d0bd5faf
 
 pkgname = dataplot
 
diff --git a/PKGBUILD b/PKGBUILD
index f8f213d2997f..1ded098c881e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,57 +3,49 @@
 # Thanks to Alan Heckert from NIST for his support
 
 pkgname=dataplot
-pkgver=2009_08_21
-pkgrel=4
+pkgver=2016_12_09
+pkgrel=1
 pkgdesc="Software for scientific visualization, statistical analysis, and non-linear modeling."
 arch=('i686' 'x86_64')
 url="http://www.itl.nist.gov/div898/software/dataplot.html/"
 license=('custom')
-depends=('gd' 'gcc-libs' 'fontconfig' 'expat' 'libpng' 'zlib' 'libjpeg' 'libx11' 'freetype2' 'tcsh')
-#'readline'
-makedepends=('imagemagick' 'gcc-fortran')
+depends=('gd' 'gcc-libs' 'fontconfig' 'expat' 'libpng' 'zlib' 'libjpeg' 'libx11' 'freetype2' 'tcsh' 'readline' 'termcap' 'tk')
+makedepends=('imagemagick' 'gcc-fortran' 'gendesk')
 backup=('usr/share/dataplot/frscript/xdpConfig')
-_dplibver=2009_07_15
-_dcommandver=2009_06_21
-source=("ftp://ftp.nist.gov/pub/dataplot/unix/dpsrc_${pkgver}.tar.gz"
-	"ftp://ftp.nist.gov/pub/dataplot/unix/dplib.${_dplibver}.tar.gz"
-	"ftp://ftp.nist.gov/pub/dataplot/unix/dataplot_command.${_dcommandver}.tar.gz"
-	"dataplot.sh"
-	"xdataplot.desktop")
+source=("http://www.itl.nist.gov/div898/software/dataplot/ftp/unix/dpsrc_${pkgver}.tar.gz"
+        "http://www.itl.nist.gov/div898/software/dataplot/ftp/unix/dplib.tar.gz"
+        "dataplot.sh")
 noextract=("dpsrc_${pkgver}.tar.gz"
-	       "dplib.${pkgver}.tar.gz")
+           "dplib.tar.gz")
 
 build() {
-
-  # I make the directory for the dataplot source files
+  cd ${srcdir}
+  gendesk -n -f \
+          --pkgname="${pkgname}" \
+          --pkgdesc="${pkgdesc}" \
+          --name="xdataplot" \
+          --categories="Education;Science;Math;" \
+          --exec="/usr/bin/xdataplot" \
+          --startupnotify=true
+  
+  # Make the directory for dataplot source files
   if [ ! -d ${srcdir}/dpsrc ];then
-	  mkdir -p ${srcdir}/dpsrc
+         mkdir -p ${srcdir}/dpsrc
   fi
   cd ${srcdir}/dpsrc
   bsdtar -xf ${srcdir}/dpsrc_${pkgver}.tar.gz
-  
-  # Copy the build script...
-  _build_script=build_linux_gfortran.bash
-  cp ${srcdir}/command/${_build_script} ${srcdir}/dpsrc/ || return 1
 
-  # ...and configure it:
-  # - Changing the build directory
-  sed -i "s@/usr/local/src/dataplot@${srcdir}/dpsrc@g" ${srcdir}/dpsrc/${_build_script}
+  _build_script=build_linux_gfortran.bash
 
-  # - I prefer not to sacrifice precision and/or good behaviour for speed 
+  # I prefer not to sacrifice precision and/or good behaviour for speed 
   # If you want speed, just comment the next line
-  sed -i 's@IOPT="-O2"@#IOPT="-O2"@' ${srcdir}/dpsrc/${_build_script}
-
-  # - Enabling readline support
-#  sed -i 's@HAVE_RL=off@#HAVE_RL=off@' ${srcdir}/dpsrc/${_build_script}
-#  sed -i 's@#HAVE_RL=on@HAVE_RL=on@' ${srcdir}/dpsrc/${_build_script}
-#  sed -i 's@-ltermcap@@g' ${srcdir}/dpsrc/${_build_script}
-
-  # - By default, the build script is for i686 machines, so I change it in case of 
-  # compiling the package in a 64 bit machine
-  if [ "${CARCH}" = "x86_64" ]; then
-   sed -i 's@IBIT=32@#IBIT=32@' ${srcdir}/dpsrc/${_build_script}
-   sed -i 's@#IBIT=64@IBIT=64@' ${srcdir}/dpsrc/${_build_script}
+  sed -i 's@IOPT="-O1"@#IOPT="-O1"@' ${srcdir}/dpsrc/${_build_script}
+
+  # By default, the build script is for 64 bit machines, so I change it in case of 
+  # compiling the package in a 32 bit machine
+  if [ "${CARCH}" = "i686" ]; then
+   sed -i 's@IBIT=64@#IBIT=64@' ${srcdir}/dpsrc/${_build_script}
+   sed -i 's@#IBIT=32@IBIT=32@' ${srcdir}/dpsrc/${_build_script}
   fi
 
   # Running the build script
@@ -66,34 +58,37 @@ package() {
   
   # Moving the dataplot binary to ${pkgdir}
   mkdir -p ${pkgdir}/usr/bin/
-  mv ${srcdir}/dpsrc/dataplot ${pkgdir}/usr/bin/ || return 1
+  mv ${srcdir}/dpsrc/dataplot ${pkgdir}/usr/bin/
 
   # Preparing the dataplot auxiliary files
   mkdir -p ${pkgdir}/usr/share/dataplot/
   cd ${pkgdir}/usr/share/dataplot/
-  bsdtar -xf ${srcdir}/dplib.${_dplibver}.tar.gz
-
-  # - Modifying the xdataplot script
-  sed -i 's@/usr/local/lib/dataplot@/usr/share/dataplot@' frscript/xdataplot
-  sed -i 's@/usr/share/dataplot/tcl@/usr/lib/tcl8.5/@' frscript/xdataplot
-  sed -i 's@/usr/share/dataplot/tk@/usr/lib/tk8.5/@' frscript/xdataplot
+  bsdtar -xf ${srcdir}/dplib.tar.gz
 
-  # - Modifying the xdp script
- # sed -i 's@#!/itl/links/generic/bin/wish@#!/usr/bin/tclsh -f@' frscript/xdp
+  # Modifying the xdataplot script
+  sed -i 's@#set tcl_prefix = /usr/local/lib@set tcl_prefix = /usr@' frscript/xdataplot
+  sed -i "s@/lib/dataplot/@/share/dataplot/@g" frscript/xdataplot
+  sed -i "s@/lib/frscript/@/share/dataplot/frscript/@g" frscript/xdataplot
+  
+  source /usr/lib/tclConfig.sh
+  sed -i "s@/lib/tcl@/lib/tcl${TCL_VERSION}@" frscript/xdataplot
+  
+  source /usr/lib/tkConfig.sh
+  sed -i "s@/lib/tk@/lib/tk${TK_VERSION}@" frscript/xdataplot
 
-  # - Modifying the config file of xdataplot
+  # Modifying the config file of xdataplot
   sed -i 's@dataplot unix    /usr/local/bin/dataplot@dataplot unix    /usr/bin/dataplot@' frscript/xdpConfig
   sed -i 's@library  unix    /usr/local/lib/dataplot@library  unix    /usr/share/dataplot@' frscript/xdpConfig
 
-  # - Symbolic link for xdataplot in /usr/bin
+  # Symbolic link for xdataplot in /usr/bin
   ln -s /usr/share/dataplot/frscript/xdataplot ${pkgdir}/usr/bin/xdataplot
 
   # Icon and .desktop files
   mkdir -p ${pkgdir}/usr/share/pixmaps
   /usr/bin/convert ${pkgdir}/usr/share/dataplot/frscript/xdpIcon.xbm \
-  ${pkgdir}/usr/share/pixmaps/xdataplot.png || return 1
+  ${pkgdir}/usr/share/pixmaps/xdataplot.png
   mkdir -p ${pkgdir}/usr/share/applications
-  install -m 644 ${srcdir}/xdataplot.desktop ${pkgdir}/usr/share/applications/ || return 1
+  install -m 644 ${srcdir}/xdataplot.desktop ${pkgdir}/usr/share/applications/
 
   # Copying dataplot.sh to ${pkgdir}/etc/profile.d so dataplot will know
   # where its files are
@@ -126,8 +121,6 @@ EOF
   chmod 755 ${pkgdir}/usr/share/dataplot/frscript/xdp
 }
 
-md5sums=('d69caec4a853043dc6c4390da61cc34f'
-         '6f978d7df658207bf64a08c1edb57b6b'
-         'ba4d5a06ca69fa8878c559f4ad6ba73b'
-         'd212f5842a9bab712d6353dbb66198d8'
-         '5cd4b7779bbfb926bf9daf27d0bd5faf')
+md5sums=('b46dcb3b49487da6ab1d4989f6b84739'
+         '0d0c534cf995c1b1119d9437835de068'
+         'd212f5842a9bab712d6353dbb66198d8')