update to 125

4 files changed, 90 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0a8c789a5de..b2f4e603bf2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
 # Generated by mksrcinfo v8
-# Wed Dec 21 17:51:53 UTC 2016
+# Fri May  4 18:26:32 UTC 2018
 pkgbase = nagelfar
 	pkgdesc = Tcl syntax checker
-	pkgver = 1.2.4
+	pkgver = 1.2.5
 	pkgrel = 1
 	url = http://nagelfar.sourceforge.net/
 	arch = any
 	license = GPL
 	depends = tcl
-	source = http://downloads.sourceforge.net/nagelfar/Rel_124/nagelfar124.tar.gz
-	md5sums = bbc6e0ab459bdafcc322e3e956edadf4
+	source = http://downloads.sourceforge.net/nagelfar/Rel_125/nagelfar125.tar.gz
+	source = nagelfar-paths.patch
+	source = doc-syntaxdatabase.patch
+	md5sums = 707e3c305437dce1f14103f0bd058fc9
+	md5sums = 80a3e5df0bf55548a29329948a3b541c
+	md5sums = 48f75a0c131cc17df6b38a2f5967c7e4
 
 pkgname = nagelfar
 
diff --git a/PKGBUILD b/PKGBUILD
index 27db0a625fa6..99ced1b2706a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=nagelfar
 _pkgver_main=1
 _pkgver_sub=2
-_pkgver_subsub=4
+_pkgver_subsub=5
 pkgver="${_pkgver_main}.${_pkgver_sub}.${_pkgver_subsub}"
 _pkgver="${_pkgver_main}${_pkgver_sub}${_pkgver_subsub}"
 pkgrel=1
@@ -23,52 +23,56 @@ backup=()
 options=()
 install=
 changelog=
-source=("http://downloads.sourceforge.net/nagelfar/Rel_${_pkgver}/${pkgname}${_pkgver}.tar.gz")
+source=("http://downloads.sourceforge.net/nagelfar/Rel_${_pkgver}/${pkgname}${_pkgver}.tar.gz" nagelfar-paths.patch doc-syntaxdatabase.patch)
 noextract=()
-md5sums=("bbc6e0ab459bdafcc322e3e956edadf4")
+md5sums=('707e3c305437dce1f14103f0bd058fc9'
+         '80a3e5df0bf55548a29329948a3b541c'
+         '48f75a0c131cc17df6b38a2f5967c7e4')
 validpgpkeys=()
 
+
+prepare() {
+    cd ${pkgname}${_pkgver}
+    patch -Np1 -i "${srcdir}/doc-syntaxdatabase.patch"
+    patch -Np1 -i "${srcdir}/nagelfar-paths.patch"
+}
+
+
 package() {
-    # lib
+    cd ${pkgname}${_pkgver}
+
+    # install script, removing trailing .tcl
+    install -D -m755 ${pkgname}.tcl ${pkgdir}/usr/bin/${pkgname}
+
+    # install libs
     lib_path="/usr/lib/${pkgname}"
-    install -d -m755 "${pkgdir}/${lib_path}"
+    install -d -m755 "${pkgdir}${lib_path}"
 
     # textsearch package
     for file_path in "lib/textsearch/tcl/textsearch.tcl" "lib/textsearch/pkgIndex.tcl" ; do
-        install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
+        install -D -m644 "${file_path}" "${pkgdir}${lib_path}/${file_path}"
     done
 
     # packagedb
-    for file in "${srcdir}/${pkgname}${_pkgver}/packagedb"/* ; do
-        install -D -t "${pkgdir}${lib_path}/packagedb" -m644 "${file}"
+    install -d -m755 "${pkgdir}${lib_path}/packagedb"
+    for p in packagedb/* ; do
+        install -m644 $p "${pkgdir}${lib_path}/packagedb"
     done
 
     # syntax stuff
-    for file in "${srcdir}/${pkgname}${_pkgver}"/{syntax*.tcl,*.syntax} ; do
+    for file in {syntax*.tcl,*.syntax} ; do
         install -D -t "${pkgdir}${lib_path}" -m644 "${file}"
     done
 
-    # main
-    file="nagelfar.tcl"
-    install -D -m755 "${srcdir}/${pkgname}${_pkgver}/${file}" "${pkgdir}${lib_path}/${file}"
-
     # doc
     doc_path="/usr/share/doc/${pkgname}"
-    install -d -m755 "${pkgdir}/${doc_path}"
-
-    for file in "${srcdir}/${pkgname}${_pkgver}/doc"/* ; do
-        install -D -t "${pkgdir}${doc_path}/doc" -m644 "${file}"
+    install -d -m755 "${pkgdir}${doc_path}"
+    for d in doc/* ; do
+        install -m644 $d "${pkgdir}${doc_path}"
     done
 
     # license
     lic_path="/usr/share/licenses/${pkgname}"
-    install -d -m755 "${pkgdir}/${lic_path}"
-
-    file_path="COPYING"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lic_path}/${file_path}"
-
-    # binary
-    install -d -m755 "${pkgdir}/usr/bin"
-    cd "${pkgdir}/usr/bin"
-    ln -s "../lib/${pkgname}/${pkgname}.tcl" "${pkgname}"
+    install -d -m755 "${pkgdir}${lic_path}"
+    install -m644 "COPYING" "${pkgdir}${lic_path}"
 }
diff --git a/doc-syntaxdatabase.patch b/doc-syntaxdatabase.patch
new file mode 100644
index 000000000000..e0c3100ba664
--- /dev/null
+++ b/doc-syntaxdatabase.patch
@@ -0,0 +1,28 @@
+--- a/doc/syntaxdatabases.txt
++++ b/doc/syntaxdatabases.txt
+@@ -15,9 +15,9 @@ search order for default database is:
+ * syntaxdb*.tcl in current directory (if more than one it is
+   unspecified which)
+ 
+-* syntaxdb.tcl where Nagelfar is located
++* syntaxdb.tcl in /usr/lib/nagelfar
+ 
+-* syntaxdb*.tcl where Nagelfar is located
++* syntaxdb*.tcl in /usr/lib/nagelfar
+ 
+ You can select database(s) with the command line switch “-s”.
+ 
+@@ -37,11 +37,11 @@ script will run.
+ 
+ For example, if you want to create a database for Tcl8.2:
+ 
+-"$ tclsh82 syntaxbuild.tcl syntaxdb82.tcl"
++"$ tclsh82 /usr/lib/nagelfar/syntaxbuild.tcl syntaxdb82.tcl"
+ 
+ or
+ 
+-"$ tclsh82 % source syntaxbuild.tcl % buildFile syntaxdb82.tcl % exit"
++"$ tclsh82 % source /usr/lib/nagelfar/syntaxbuild.tcl % buildFile syntaxdb82.tcl % exit"
+ 
+ Then use it:
+ 
diff --git a/nagelfar-paths.patch b/nagelfar-paths.patch
new file mode 100644
index 000000000000..1e1b7ef66af4
--- /dev/null
+++ b/nagelfar-paths.patch
@@ -0,0 +1,24 @@
+--- a/nagelfar.tcl
++++ b/nagelfar.tcl
+@@ -28,7 +28,7 @@
+ #----------------------------------------------------------------------
+ 
+ set debug 0
+-package require Tcl 8.4
++package require Tcl 8.5
+ 
+ package provide app-nagelfar 1.0
+ # This variable should be overwritten by the build process
+@@ -50,9 +50,9 @@
+ unset tmplink
+ 
+ # This makes it possible to customize where files are installed
+-set dbDir      $thisDir
+-set docDir     $thisDir/doc
+-set libDir     $thisDir/lib
++set dbDir      /usr/lib/nagelfar
++set docDir     /usr/share/doc/nagelfar
++set libDir     /usr/lib/nagelfar/lib
+  
+ # Search where the script is, to be able to place e.g. ctext there.
+ if {[info exists ::starkit::topdir]} {