add lib-makefile.in.patch

3 files changed, 6 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e561c3d35c61..a5b7603547e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = env-modules-tcl
 	pkgdesc = Provides for an easy dynamic modification of a user's environment via modulefile.
 	pkgver = 4.3.0
-	pkgrel = 0
+	pkgrel = 1
 	url = https://sourceforge.net/projects/modules/
 	install = env-modules-tcl.install
 	arch = i686
@@ -16,6 +16,7 @@ pkgbase = env-modules-tcl
 	source = moduleshome.patch
 	md5sums = bc45aff23db73a38f635d3311c61ce16
 	md5sums = 7e6bf66733845eb3705a0a19c029eed6
+	md5sums = 6be36c0076bde45c0cc856b742ff701b
 
 pkgname = env-modules-tcl
 
diff --git a/PKGBUILD b/PKGBUILD
index 1dac1aa9bc54..54a8ad2e7d6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: snafu
 pkgname=(env-modules-tcl)
 pkgver=4.3.0
-pkgrel=0
+pkgrel=1
 epoch=
 pkgdesc="Provides for an easy dynamic modification of a user's environment via modulefile."
 arch=('i686' 'x86_64')
@@ -22,7 +22,8 @@ source=("https://sourceforge.net/projects/modules/files/Modules/modules-$pkgver/
 noextract=()
 validpgpkeys=()
 md5sums=('bc45aff23db73a38f635d3311c61ce16'
-         '7e6bf66733845eb3705a0a19c029eed6')
+         '7e6bf66733845eb3705a0a19c029eed6'
+         '6be36c0076bde45c0cc856b742ff701b')
 
 # Install locations:
 install_prefix=/usr
@@ -37,6 +38,7 @@ prepare() {
     cd "modules-$pkgver"
 
     patch -p1 < ../moduleshome.patch
+    patch -p1 < ../lib-makefile.in.patch
 }
 
 build() {
diff --git a/zshcomp.patch b/zshcomp.patch
deleted file mode 100644
index eaaad5c807c1..000000000000
--- a/zshcomp.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/init/zsh-functions/_module
-+++ a/init/zsh-functions/_module
-@@ -4,17 +4,35 @@
- # Zsh command-line completion for module
- # Copyright (C) 2017 Xavier Delaruelle <xavier.delaruelle@cea.fr>
- #
-+# patched version:
-+#  - directory-wise completion
-+#
- 
--_module_avail() {
--   module avail -t 2>&1 | sed '
--      /^-\+/d; /^\s*$/d;
--      /->.*$/d;
--      /:$/d;
--      /:ERROR:/d;
--      s#^\(.*\)/\(.\+\)(.*default.*)#\1\n\1\/\2#;
--      s#(.*)$##g;
--      s#\s*$##g;
--      s#/*$##g;'
-+function _module_completion () {
-+   emulate -L zsh
-+   local _module_path_prefix
-+   local -a _module_search_path _module_type_d _module_type_f
-+   _module_path_prefix=$(echo ${(q)words[$CURRENT]} | sed -ne 's#\(.*/\).*#\1#p')
-+   _module_search_paths=(${^${(@s/:/)MODULEPATH}}/$_module_path_prefix)
-+
-+   _module_type_d=()
-+   _module_type_f=()
-+   eval $(find $_module_search_paths -mindepth 1 -maxdepth 1 -not -name '.modulerc' -not -name '.version' -printf "_module_type_%Y+=${(q)_module_path_prefix}%P\n" 2> /dev/null)
-+
-+   case "$@" in
-+      dir)
-+         compadd ${_module_type_d}
-+         ;;
-+      notloaded)
-+         local -a _modules_loaded=(${=LOADEDMODULES//:/})
-+         compadd -q -S / ${_module_type_d}
-+         compadd ${_module_type_f:|_modules_loaded}
-+         ;;
-+      *)
-+         compadd -q -S / ${_module_type_d}
-+         compadd ${_module_type_f}
-+         ;;
-+   esac
- }
- 
- _module_savelist() {
-@@ -24,16 +42,13 @@ _module_savelist() {
-       /:ERROR:/d;'
- }
- 
--_module_not_yet_loaded() {
--   _module_avail | sort | sed -E "\%^(${LOADEDMODULES//:/|})$%d"
--}
-+_module_all_mods() {
-+    _module_completion
-+ }
- 
- 
- _module_avail_mods() {
--   local -a avail_mods;
--   avail_mods=(${$(_module_avail)})
--
--   _describe -t avail-mods 'available modulefiles' avail_mods && ret=0
-+    _module_completion dir
- }
- 
- _module_saved_colls() {
-@@ -44,10 +59,8 @@ _module_saved_colls() {
- }
- 
- _module_notloaded_mods() {
--   local -a not_yet_loaded_mods;
--   not_yet_loaded_mods=(${$(_module_not_yet_loaded)})
-+   _module_completion notloaded
- 
--   _describe -t avail-mods 'available modulefiles' not_yet_loaded_mods && ret=0
- }
- 
- _module_loaded_mods() {
-@@ -177,7 +190,7 @@ _module() {
-                   '*:modulepath:_files -/' && ret=0
-                ;;
-             (display|help|show|test|whatis|is-loaded|is-avail|info-loaded)
--               _alternative 'avail-mods:modulefiles:{_module_avail_mods}' \
-+               _alternative 'avail-mods:modulefiles:{_module_all_mods}' \
-                   && ret=0
-                ;;
-             (append-path|prepend-path)