updated to current source location

3 files changed, 10 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05ab564d672c..8d82aaaac84c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Mar 19 13:02:47 UTC 2018
+# Wed Jun 26 14:43:21 UTC 2019
 pkgbase = upak
 	pkgdesc = HRIBF Data Acquisition and analysis.
 	pkgver = 10.6.8
-	pkgrel = 8
+	pkgrel = 9
 	url = ftp://ftp.phy.ornl.gov/pub/upak/README.html
 	install = upak.install
 	arch = x86_64
@@ -14,11 +14,9 @@ pkgbase = upak
 	depends = bash
 	options = staticlibs
 	options = emptydirs
-	source = ftp://ftp.phy.ornl.gov/pub/upak/upak-src.tar.gz
-	source = Dscanor.Makefile.patch
+	source = ftp://ftp.phy.ornl.gov/pub/upak/upak-src.tgz
 	source = upak.install
-	md5sums = bcdddfd685f4a19cd93452be18de238b
-	md5sums = ec5128392e9f7b52a3e5dc5650cd7de5
+	md5sums = 6fda860ff33eda39c2914f34453ce96b
 	md5sums = 7d8e9e7ec0f6ed54683a65f640899e20
 
 pkgname = upak
diff --git a/Dscanor.Makefile.patch b/Dscanor.Makefile.patch
deleted file mode 100644
index 7516284a48e0..000000000000
--- a/Dscanor.Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/upak/Dscanor/Makefile	2015-04-01 21:22:29.000000000 +0200
-+++ Dscanor.Makefile	2018-03-19 12:17:52.857454246 +0100
-@@ -22,8 +22,8 @@ install: scanor scanof
- 	install -d $(INSTALLDIR)
- 	install -p scanor.o $(INSTALLDIR)
- 	rm -f *.exe  scanor
--	install -p scanor.hhirf.make $(INSTALLDIR)
-+	install -p scanor.gfortran.make $(INSTALLDIR)
- 	install -p scanof.o $(INSTALLDIR)
- 	rm -f *.exe  scanof
--	install -p scanof.hhirf.make $(INSTALLDIR)
-+	install -p scanof.gfortran.make $(INSTALLDIR)
- 	install -p scanor.hep $(INSTALLDIR)
diff --git a/PKGBUILD b/PKGBUILD
index 5838f905102a..b2ab7ceeecc4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Luis Sarmiento <Luis.Sarmiento-ala-nuclear.lu.se>
 
 pkgname=upak
-pkgver=10.6.8
-pkgrel=8
+pkgver=10.6.8 # <-- current source doesn't have a version. We keep the last known one
+pkgrel=9
 pkgdesc="HRIBF Data Acquisition and analysis."
 url="ftp://ftp.phy.ornl.gov/pub/upak/README.html"
 arch=('x86_64')
@@ -10,31 +10,20 @@ license=('unknown')
 depends=('libx11' 'tcsh' 'bash')
 makedepends=('gcc-fortran>=4.2')
 options=(staticlibs emptydirs)
-source=("ftp://ftp.phy.ornl.gov/pub/${pkgname}/${pkgname}-src.tar.gz"
-  "Dscanor.Makefile.patch"
+source=("ftp://ftp.phy.ornl.gov/pub/${pkgname}/${pkgname}-src.tgz"
   "upak.install")
-md5sums=('bcdddfd685f4a19cd93452be18de238b'
-         'ec5128392e9f7b52a3e5dc5650cd7de5'
+md5sums=('6fda860ff33eda39c2914f34453ce96b'
          '7d8e9e7ec0f6ed54683a65f640899e20')
-install="${pkgname}.install"
-
-prepare() {
 
-  #
-  #  diff -puN src/upak/Dscanor/Makefile Dscanor.Makefile > Dscanor.Makefile.patch
-  #
-  msg 'patch Dscanor Makefile'
-  cd "${srcdir}/${pkgname}/Dscanor"
-  patch -Np3 < ${srcdir}/Dscanor.Makefile.patch
 
-}
+install="${pkgname}.install"
 
 package() {
 
   ## compile
   cd "${srcdir}/${pkgname}"
   make clean
-  make -j1 INSTALLDIR="${pkgdir}/usr/bin" all
+  make -j1 INSTALLDIR="${pkgdir}/usr/bin" all  # <-- this already goes to ${pkgdir} therefore must be package() not build()
 
   ## documentation (0)
   _DOCDIR=${pkgdir}/usr/share/doc/${pkgname}