mate-indicator-applet: Fix shell portability.

2 files changed, 129 insertions, 2 deletions

diff --git a/x11/mate-indicator-applet/distinfo b/x11/mate-indicator-applet/distinfo
index d54c1579559..0dfb344c8c6 100644
--- a/x11/mate-indicator-applet/distinfo
+++ b/x11/mate-indicator-applet/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2018/05/14 13:01:45 youri Exp $
+$NetBSD: distinfo,v 1.4 2018/05/16 11:07:14 jperkin Exp $
 
 SHA1 (mate-indicator-applet-1.20.0.tar.xz) = dd68ae59a38de4bf4eb98644000ab027cdee6991
 RMD160 (mate-indicator-applet-1.20.0.tar.xz) = 14f356fc69416c6ce1ee3900acc74a41f39a93f0
 SHA512 (mate-indicator-applet-1.20.0.tar.xz) = 3f0fa40359d9b489471df5b22537d4ce6334a8c4e9024723e3e00f25ba75919f5c9f7ad8c79f4d946116b00b5aac6eed26ab149fdf01588b94d1be44f7ca23d5
 Size (mate-indicator-applet-1.20.0.tar.xz) = 334480 bytes
-SHA1 (patch-configure) = f182c563091312cd5f81ce6588c2284ea1a31e95
+SHA1 (patch-configure) = 0320c192cd52900458144544145ef21149ca3d8a
diff --git a/x11/mate-indicator-applet/patches/patch-configure b/x11/mate-indicator-applet/patches/patch-configure
new file mode 100644
index 00000000000..d8a541f826c
--- /dev/null
+++ b/x11/mate-indicator-applet/patches/patch-configure
@@ -0,0 +1,127 @@
+$NetBSD: patch-configure,v 1.1 2018/05/16 11:07:14 jperkin Exp $
+
+Shell portability.
+
+--- configure.orig	2018-02-02 14:27:33.000000000 +0000
++++ configure
+@@ -13044,7 +13044,7 @@ fi
+ 
+ ### decide on what Indicators implementation to use...
+ 
+-if   test "x$have_ayatanaindicator" == "xyes" &&
++if   test "x$have_ayatanaindicator" = "xyes" &&
+      test "x$have_ubuntuindicator" != "xyes" &&
+      test "x$with_ubuntu_indicators" != "xyes"; then
+ 
+@@ -13052,7 +13052,7 @@ if   test "x$have_ayatanaindicator" == "
+     use_ayatanaindicator="yes";
+     indicator_enforced="no";
+ 
+-elif test "x$have_ubuntuindicator" == "xyes" &&
++elif test "x$have_ubuntuindicator" = "xyes" &&
+      test "x$have_ayatanaindicator" != "xyes" &&
+      test "x$with_ayatana_indicators" != "xyes"; then
+ 
+@@ -13060,31 +13060,31 @@ elif test "x$have_ubuntuindicator" == "x
+     use_ubuntuindicator="yes";
+     indicator_enforced="no";
+ 
+-elif test "x$have_ubuntuindicator" == "xyes" &&
+-     test "x$have_ayatanaindicator" == "xyes" &&
+-     test "x$with_ayatana_indicators" == "xyes"; then
++elif test "x$have_ubuntuindicator" = "xyes" &&
++     test "x$have_ayatanaindicator" = "xyes" &&
++     test "x$with_ayatana_indicators" = "xyes"; then
+ 
+     # both Indicator implementations are present, and we are asked to use Ayatana Indicators
+     use_ayatanaindicator=yes;
+     indicator_enforced=yes;
+ 
+-elif test "x$have_ubuntuindicator" == "xyes" &&
+-     test "x$have_ayatanaindicator" == "xyes" &&
+-     test "x$with_ubuntu_indicators" == "xyes"; then
++elif test "x$have_ubuntuindicator" = "xyes" &&
++     test "x$have_ayatanaindicator" = "xyes" &&
++     test "x$with_ubuntu_indicators" = "xyes"; then
+ 
+     # both Indicator implementations are present, and we are asked to use Ubuntu Indicators
+     use_ubuntuindicator=yes;
+     indicator_enforced=yes;
+ 
+-elif test "x$have_ubuntuindicator" == "xyes" &&
++elif test "x$have_ubuntuindicator" = "xyes" &&
+      test "x$have_ayatanaindicator" != "xyes" &&
+-     test "x$with_ayatana_indicators" == "xyes"; then
++     test "x$with_ayatana_indicators" = "xyes"; then
+ 
+     as_fn_error $? "Ubuntu Indicators are present, but you want to build mate-indicator-applet against Ayatana Indicators. This does not match." "$LINENO" 5
+ 
+ elif test "x$have_ubuntuindicator" != "xyes" &&
+-     test "x$have_ayatanaindicator" == "xyes" &&
+-     test "x$with_ubuntu_indicators" == "xyes"; then
++     test "x$have_ayatanaindicator" = "xyes" &&
++     test "x$with_ubuntu_indicators" = "xyes"; then
+ 
+     as_fn_error $? "Ayatana Indicators are present, but you want to build mate-indicator-applet against Ubuntu Indicators. This does not match." "$LINENO" 5
+ 
+@@ -13096,7 +13096,7 @@ fi
+ 
+ ### prepare Ayatana or Ubuntu Indicators implementation for the build, regarding to the decision reached above...
+ 
+-if   test "x$use_ayatanaindicator" == "xyes"; then
++if   test "x$use_ayatanaindicator" = "xyes"; then
+ 
+      if true; then
+   WITH_AYATANA_INDICATOR_TRUE=
+@@ -13118,7 +13118,7 @@ fi
+ $as_echo "#define HAVE_AYATANA_INDICATOR 1" >>confdefs.h
+ 
+ 
+-    if test "x$indicator_enforced" == "xyes"; then
++    if test "x$indicator_enforced" = "xyes"; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: Using Ayatana Indicators for this build (as requested via configure option)." >&5
+ $as_echo "$as_me: Using Ayatana Indicators for this build (as requested via configure option)." >&6;}
+     else
+@@ -13326,7 +13326,7 @@ fi
+ 
+ 
+ 
+-elif test "x$use_ubuntuindicator" == "xyes"; then
++elif test "x$use_ubuntuindicator" = "xyes"; then
+ 
+     # both Indicator implementations are present, and we are asked to use Ubuntu Indicators
+      if true; then
+@@ -13349,7 +13349,7 @@ fi
+ $as_echo "#define HAVE_UBUNTU_INDICATOR 1" >>confdefs.h
+ 
+ 
+-    if test "x$indicator_enforced" == "xyes"; then
++    if test "x$indicator_enforced" = "xyes"; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: Using Ubuntu Indicators for this build (as requested via configure option)." >&5
+ $as_echo "$as_me: Using Ubuntu Indicators for this build (as requested via configure option)." >&6;}
+     else
+@@ -16827,18 +16827,18 @@ fi
+ # Results
+ ###########################
+ 
+-if (test "x$use_ayatanaindicator" == "xyes" &&
+-    test "x$have_ayatanaindicator_ng" == "xyes") ||
+-   (test "x$use_ubuntuindicator" == "xyes" &&
+-    test "x$have_ubuntuindicator_ng" == "xyes"); then
++if (test "x$use_ayatanaindicator" = "xyes" &&
++    test "x$have_ayatanaindicator_ng" = "xyes") ||
++   (test "x$use_ubuntuindicator" = "xyes" &&
++    test "x$have_ubuntuindicator_ng" = "xyes"); then
+     have_indicator_ng="yes"
+ else
+     have_indicator_ng="no"
+ fi
+ 
+-if test "x$use_ayatanaindicator" == "xyes"; then
++if test "x$use_ayatanaindicator" = "xyes"; then
+     indicator_implementation="Ayatana Indicators"
+-elif test "x$use_ubuntuindicator" == "xyes"; then
++elif test "x$use_ubuntuindicator" = "xyes"; then
+     indicator_implementation="Ubuntu Indicators"
+ fi
+