New commits:
commit 5de18b9bad26e32bfeab704aa6a83338ab53288b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
oniguruma: Updated to 5.9.6
Geocities site is way dead, moved to GitHub
commit 26844c3dca9eecb481cdfe4c6a95fe817355d5ba
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
lm_sensors: Added a mirror as lm-sensors.org has been down for a month
commit 87f14147b7d1ee239402e83f5ede8a114fc30e48
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
ocaml: Removed Labltk from the distribution, now available as a
third-party library
commit bbbebe3048a38733d315cb5d77a13a105c51587d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
In Ruby 1.9, Oniguruma is already integrated by Kazuo Saito
EOF
-
diff --git a/libs/oniguruma/HISTORY b/libs/oniguruma/HISTORY
index 7b4054c..716e31a 100644
--- a/libs/oniguruma/HISTORY
+++ b/libs/oniguruma/HISTORY
@@ -1,3 +1,7 @@
+2015-11-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 5.9.6
+ Geocities site is way dead, moved to GitHub
+
2015-03-10 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.7.1
diff --git a/libs/oniguruma/onig-5.9.6.tar.gz.sig
b/libs/oniguruma/onig-5.9.6.tar.gz.sig
new file mode 100644
index 0000000..42dfe08
Binary files /dev/null and b/libs/oniguruma/onig-5.9.6.tar.gz.sig differ
diff --git a/net/nfs-utils/DEPENDS b/net/nfs-utils/DEPENDS
index f7d1a23..3ff655c 100755
--- a/net/nfs-utils/DEPENDS
+++ b/net/nfs-utils/DEPENDS
@@ -20,5 +20,5 @@ if [[ "$NFS_UTILS_NFSV4" == "--enable-nfsv4" ]]; then
"--disable-nfsv41" \
"for NFS v4.1 support"
else
- list_add "NFS_UTILS_NFSV4" "--disable-nfsv41"
+ list_add "NFS_UTILS_NFSV4" "--disable-nfsv4 --disable-nfsv41"
fi
diff --git a/net/nfs-utils/HISTORY b/net/nfs-utils/HISTORY
index 9c9df33..0e5abc6 100644
--- a/net/nfs-utils/HISTORY
+++ b/net/nfs-utils/HISTORY
@@ -1,3 +1,7 @@
+2015-11-12 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Use correct CONFIG_NFS_V4 check for NFSv4
+ Check for CONFIG_NFS_V4 and CONFIG_NFS_V4_1 as needed.
+
2015-10-31 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: idmapd support requires DNOTIFY enabled in the kernel.
diff --git a/net/nfs-utils/PRE_BUILD b/net/nfs-utils/PRE_BUILD
index 434977b..29b2fca 100755
--- a/net/nfs-utils/PRE_BUILD
+++ b/net/nfs-utils/PRE_BUILD
@@ -1,9 +1,18 @@
if list_find "${NFS_UTILS_NFSV4}" "--enable-nfsv4"; then
- if [[ "$(get_kernel_config NFS_UTILS_NFSV4)" != "y" &&
- "$(get_kernel_config NFS_UTILS_NFSV4)" != "m" ]]; then
+ if [[ "$(get_kernel_config CONFIG_NFS_V4)" != "y" &&
+ "$(get_kernel_config CONFIG_NFS_V4)" != "m" ]]; then
message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
- "NFS_UTILS_NFSV4 module/built-in${DEFAULT_COLOR}" &&
+ "CONFIG_NFS_V4 module/built-in${DEFAULT_COLOR}" &&
return 1
+
+ if is_spell_enabled ${SPELL} lvm; then
+ if [[ "$(get_kernel_config CONFIG_NFS_V4_1)" != "y" &&
+ "$(get_kernel_config CONFIG_NFS_V4_1)" != "m" ]]; then
+ message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR}
requires" \
+ "CONFIG_NFS_V4_1 module/built-in${DEFAULT_COLOR}" &&
+ return 1
+ fi
+ fi
fi
fi &&