updated to 124

3 files changed, 36 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27dad49bb9c0..c0a8c789a5de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 # Generated by mksrcinfo v8
-# Fri Jul 29 18:43:41 UTC 2016
+# Wed Dec 21 17:51:53 UTC 2016
 pkgbase = nagelfar
 	pkgdesc = Tcl syntax checker
-	pkgver = 1.2.2
+	pkgver = 1.2.4
 	pkgrel = 1
 	url = http://nagelfar.sourceforge.net/
 	arch = any
 	license = GPL
 	depends = tcl
-	source = http://downloads.sourceforge.net/nagelfar/Rel_122/nagelfar122.tar.gz
-	md5sums = 6482ec3ea21a06ee207f950527ebcb92
+	source = http://downloads.sourceforge.net/nagelfar/Rel_124/nagelfar124.tar.gz
+	md5sums = bbc6e0ab459bdafcc322e3e956edadf4
 
 pkgname = nagelfar
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..ddc9c3a5fe96
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+pkg
+src
+
+*.swp
+*.swo
+
+*.gz
+*.xz
diff --git a/PKGBUILD b/PKGBUILD
index 48435bfe95f7..27db0a625fa6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=nagelfar
 _pkgver_main=1
 _pkgver_sub=2
-_pkgver_subsub=2
+_pkgver_subsub=4
 pkgver="${_pkgver_main}.${_pkgver_sub}.${_pkgver_subsub}"
 _pkgver="${_pkgver_main}${_pkgver_sub}${_pkgver_subsub}"
 pkgrel=1
@@ -23,78 +23,51 @@ backup=()
 options=()
 install=
 changelog=
-#source=("https://sourceforge.net/projects/nagelfar/files/Rel_${_pkgver}/${pkgname}${_pkgver}.tar.gz")
 source=("http://downloads.sourceforge.net/nagelfar/Rel_${_pkgver}/${pkgname}${_pkgver}.tar.gz")
 noextract=()
-md5sums=("6482ec3ea21a06ee207f950527ebcb92")
+md5sums=("bbc6e0ab459bdafcc322e3e956edadf4")
 validpgpkeys=()
 
 package() {
+    # lib
     lib_path="/usr/lib/${pkgname}"
     install -d -m755 "${pkgdir}/${lib_path}"
 
-    file_path="lib/textsearch/tcl/textsearch.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_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}"
+    done
 
-    file_path="lib/textsearch/pkgIndex.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
+    # packagedb
+    for file in "${srcdir}/${pkgname}${_pkgver}/packagedb"/* ; do
+        install -D -t "${pkgdir}${lib_path}/packagedb" -m644 "${file}"
+    done
 
-    file_path="packagedb/inifiledb.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-    file_path="packagedb/registrydb.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-    file_path="packagedb/snitdb.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-    file_path="packagedb/sqlite3db.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-    file_path="packagedb/struct_listdb.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-    file_path="packagedb/tkdnddb.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-    file_path="packagedb/vfs_mk4db.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-
-    file_path="syntaxbuild.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-    file_path="syntaxdb84.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-    file_path="syntaxdb86.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-    file_path="syntaxdb.tcl"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-    file_path="nagelfar.syntax"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
-
-    file_path="nagelfar.tcl"
-    install -D -m755 "${srcdir}/${pkgname}${_pkgver}/${file_path}" "${pkgdir}${lib_path}/${file_path}"
+    # syntax stuff
+    for file in "${srcdir}/${pkgname}${_pkgver}"/{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}"
 
-    file_path="messages.txt"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/doc/${file_path}" "${pkgdir}${doc_path}/${file_path}"
-    file_path="call-by-name.txt"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/doc/${file_path}" "${pkgdir}${doc_path}/${file_path}"
-    file_path="inlinecomments.txt"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/doc/${file_path}" "${pkgdir}${doc_path}/${file_path}"
-    file_path="plugins.txt"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/doc/${file_path}" "${pkgdir}${doc_path}/${file_path}"
-    file_path="syntaxdatabases.txt"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/doc/${file_path}" "${pkgdir}${doc_path}/${file_path}"
-    file_path="codecoverage.txt"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/doc/${file_path}" "${pkgdir}${doc_path}/${file_path}"
-    file_path="syntaxtokens.txt"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/doc/${file_path}" "${pkgdir}${doc_path}/${file_path}"
-    file_path="README.txt"
-    install -D -m644 "${srcdir}/${pkgname}${_pkgver}/doc/${file_path}" "${pkgdir}${doc_path}/${file_path}"
+    for file in "${srcdir}/${pkgname}${_pkgver}/doc"/* ; do
+        install -D -t "${pkgdir}${doc_path}/doc" -m644 "${file}"
+    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}"