Update to 2.7.15

3 files changed, 57 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a311cfdf90f..623213eebee2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = linuxcnc
-	pkgdesc = It can interpret G-code and simulate a CNC machine (formerly EMC2).
-	pkgver = 2.7.14
-	pkgrel = 2
+	pkgdesc = LinuxCNC controls CNC machines. It can drive milling machines, lathes, 3d printers, laser cutters, plasma cutters, robot arms, hexapods, and more (formerly EMC2)
+	pkgver = 2.7.15
+	pkgrel = 1
 	url = http://linuxcnc.org/
 	arch = i686
 	arch = x86_64
-	license = GPL2
-	makedepends = git
+	license = GPL-2.0
 	makedepends = intltool
 	depends = bc
 	depends = bwidget
@@ -14,6 +13,7 @@ pkgbase = linuxcnc
 	depends = tk
 	depends = xorg-server
 	depends = python2-imaging
+	depends = python2-yapps2
 	depends = tkimg
 	depends = python2-gtkglext
 	depends = tclx
@@ -22,12 +22,10 @@ pkgbase = linuxcnc
 	depends = libtirpc
 	depends = procps-ng
 	depends = psmisc
-	source = ::git://github.com/LinuxCNC/linuxcnc.git#tag=v2.7.14
-	source = linuxcnc.sh
+	source = https://github.com/LinuxCNC/linuxcnc/archive/v2.7.15.tar.gz
 	source = libtirpc.patch
-	sha256sums = 72e4dad9c929b00d2a73d125d86f18600dc1c852abadcd3947fa0a7cbc28c88e
-	sha256sums = c0f1ea0d8c20baa5d69d89a1d6eb3549bc57cc56ff1a0af3d5b9917cbc6211a7
-	sha256sums = 92f63a3f58173fa9463329f74cff7365bfefd937729a70bbdc52684d9252333f
+	md5sums = 28ed8e2083cfb7fa5935db1884950331
+	md5sums = SKIP
 
 pkgname = linuxcnc
 
diff --git a/PKGBUILD b/PKGBUILD
index 45a6e1df69bb..341ce32fb03e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,61 @@
-# Maintainer: Peter Ivanov <ivanovp@gmail.com>
+# Maintainer:  Dimitris Kiziridis <ragouel at outlook dot com>
+# Contributor: Peter Ivanov <ivanovp@gmail.com>
 # Contributor: Alec Ari <neotheuser@ymail.com>
 
 pkgname=linuxcnc
-pkgver=2.7.14
-pkgrel=2
-pkgdesc="It can interpret G-code and simulate a CNC machine (formerly EMC2)."
+pkgver=2.7.15
+pkgrel=1
+pkgdesc="LinuxCNC controls CNC machines. It can drive milling machines, lathes, 3d printers, laser cutters, plasma cutters, robot arms, hexapods, and more (formerly EMC2)"
 arch=('i686' 'x86_64')
-license=('GPL2')
+license=('GPL-2.0')
 url="http://linuxcnc.org/"
-depends=('bc' 'bwidget' 'tcl' 'tk' 'xorg-server' 'python2-imaging' 'tkimg' 'python2-gtkglext' 'tclx' 'boost' 'boost-libs' 'libtirpc' 'procps-ng' 'psmisc')
-source=($_gitname::"git://github.com/LinuxCNC/linuxcnc.git#tag=v$pkgver" 'linuxcnc.sh' 'libtirpc.patch')
-sha256sums=('72e4dad9c929b00d2a73d125d86f18600dc1c852abadcd3947fa0a7cbc28c88e'
-            'c0f1ea0d8c20baa5d69d89a1d6eb3549bc57cc56ff1a0af3d5b9917cbc6211a7'
-            '92f63a3f58173fa9463329f74cff7365bfefd937729a70bbdc52684d9252333f')
-makedepends=('git' 'intltool')
-PKGEXT='.pkg.tar'
-
-build () {
-  find . -iname fixpaths.py -o -iname checkglade -o -iname update_ini|xargs perl -p -i -e "s/python/python2/"
-  cd $srcdir/$_gitname/src
+depends=('bc'
+         'bwidget'
+         'tcl'
+         'tk'
+         'xorg-server'
+         'python2-imaging'
+         'python2-yapps2'
+         'tkimg'
+         'python2-gtkglext'
+         'tclx'
+         'boost'
+         'boost-libs'
+         'libtirpc'
+         'procps-ng'
+         'psmisc')
+source=("https://github.com/LinuxCNC/linuxcnc/archive/v${pkgver}.tar.gz"
+        'libtirpc.patch')
+md5sums=('28ed8e2083cfb7fa5935db1884950331'
+         'SKIP')
+makedepends=('intltool')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}/src"
+  echo "export TCLLIBPATH=$TCLLIBPATH:/usr/lib/tcltk/linuxcnc" > ${pkgname}.sh
+  find . -iname fixpaths.py -o -iname checkglade -o \
+   -iname update_ini | xargs perl -p -i -e "s/python/python2/"
   patch -Np2 -i $srcdir/libtirpc.patch
-
   ./autogen.sh
-  ./configure --with-realtime=uspace --without-libmodbus --prefix=/usr --with-python=/usr/bin/python2.7 --enable-non-distributable=yes
-  make
+  ./configure --with-realtime=uspace \
+   --without-libmodbus --prefix=/usr \
+    --with-python=/usr/bin/python2.7 \
+     --enable-non-distributable=yes
 }
 
-package() {
-  cd $srcdir/linuxcnc/src
-  make install DESTDIR=${pkgdir} || return 1
-  #Stop hiding it from GNOME
-  cp -PR $srcdir/linuxcnc/share/applications $pkgdir/usr/share/
-  mkdir -p $pkgdir/etc/xdg
-#  echo To avoid conflict with linux-manpages...
-#  mv -v $pkgdir/usr/share/man/man9/abs.9.gz $pkgdir/usr/share/man/man9/linuxcnc_abs.9.gz
-  cp -PR $srcdir/linuxcnc/share/menus $pkgdir/etc/xdg/
-  install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/etc/profile.d/${pkgname}.sh"
-  ln -s /usr/bin/linuxcnc ~/Desktop/linuxcnc
+build () {
+  cd "${srcdir}/${pkgname}-${pkgver}/src"
+  make
 }
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/src"
+  DESTDIR=${pkgdir} make install 
+  cp -PR "${srcdir}/${pkgname}-${pkgver}/share/applications" $pkgdir/usr/share
+  mkdir -p "${pkgdir}/etc/xdg"
+  cp -PR "${srcdir}/${pkgname}-${pkgver}/share/menus" "${pkgdir}/etc/xdg/"
+  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/src/${pkgname}.sh" \
+   "${pkgdir}/etc/profile.d/${pkgname}.sh"
+  sed -i "s|${srcdir}||" "${pkgdir}/usr/include/linuxcnc/config.h"
+  sed -i "s|${srcdir}||" "${pkgdir}/usr/share/linuxcnc/Makefile.modinc"
+}
\ No newline at end of file
diff --git a/linuxcnc.sh b/linuxcnc.sh
deleted file mode 100755
index 95403833bf90..000000000000
--- a/linuxcnc.sh
+++ /dev/null
@@ -1 +0,0 @@
-export TCLLIBPATH=$TCLLIBPATH:/usr/lib/tcltk/linuxcnc