fix test == operator

2 files changed, 17 insertions, 8 deletions

diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo
index 1f069f01e04..75cece5eff6 100644
--- a/misc/libreoffice/distinfo
+++ b/misc/libreoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/12/18 22:50:38 ryoon Exp $
+$NetBSD: distinfo,v 1.14 2016/01/20 13:37:25 tnn Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -172,7 +172,7 @@ SHA1 (patch-Repository.mk) = 01a1fe049fc192a2b8b171b7162e3d34da1480c0
 SHA1 (patch-bin_distro-install-desktop-integration) = 292abb5c40018547bc58efa092eb7014dc28dced
 SHA1 (patch-bin_distro-install-file-lists) = 782e2943a8438fb0ff033b97eda8ad4923453774
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = 9d7bb01d816003e90f36631c21b71c53b8ec0127
-SHA1 (patch-configure.ac) = 4314429f4e612e340413e45c0b2dcec1db3b8495
+SHA1 (patch-configure.ac) = 50e867eafc89b0e262b9c09ef3b495cf70508d79
 SHA1 (patch-desktop_Library__sofficeapp.mk) = 320ab924a87607ed98c3404ed9d8688cbbed820a
 SHA1 (patch-include_LibreOfficeKit_LibreOfficeKitInit.h) = ce962b5d8646038150d57b02fd25a03eef592bb6
 SHA1 (patch-libreofficekit_Executable__gtktiledviewer.mk) = aa0967fe3e4d0f74dae899ac0b2d293a447af630
diff --git a/misc/libreoffice/patches/patch-configure.ac b/misc/libreoffice/patches/patch-configure.ac
index efc58fb1490..332d291cd5f 100644
--- a/misc/libreoffice/patches/patch-configure.ac
+++ b/misc/libreoffice/patches/patch-configure.ac
@@ -1,13 +1,22 @@
-$NetBSD: patch-configure.ac,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.2 2016/01/20 13:37:25 tnn Exp $
 
 * Use gstreamer under OpenBSD
 * Add FreeBSD support (GNU patch is not needed)
 * Detect pkgsrc apache-ant library
 * Fix installation directory
 
---- configure.ac.orig	2015-07-31 00:32:43.000000000 +0000
+--- configure.ac.orig	2015-12-11 02:29:35.000000000 +0000
 +++ configure.ac
-@@ -7882,7 +7882,7 @@ no|disable)
+@@ -6797,7 +6797,7 @@ dnl ====================================
+ dnl Set target Java bytecode version
+ dnl ===================================================================
+ if test "$ENABLE_JAVA" != ""; then
+-    if test "$HAVE_JAVA9" == "TRUE"; then
++    if test "$HAVE_JAVA9" = "TRUE"; then
+         _java_target_ver="1.6"
+     else
+         _java_target_ver="1.5"
+@@ -7894,7 +7894,7 @@ no|disable)
      else
          # Unset variables set by the above AM_PATH_PYTHON so that
          # we actually do check anew.
@@ -16,7 +25,7 @@ $NetBSD: patch-configure.ac,v 1.1 2015/08/12 00:57:20 ryoon Exp $
          AM_PATH_PYTHON([3.3],, [:])
          if test "$PYTHON" = ":"; then
              if test -z "$PYTHON_FOR_BUILD"; then
-@@ -7935,9 +7935,9 @@ if test $enable_python = system; then
+@@ -7947,9 +7947,9 @@ if test $enable_python = system; then
      elif test "$cross_compiling" != yes; then
          # Unset variables set by the above AM_PATH_PYTHON so that
          # we actually do check anew.
@@ -28,7 +37,7 @@ $NetBSD: patch-configure.ac,v 1.1 2015/08/12 00:57:20 ryoon Exp $
          python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
          python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
          python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
-@@ -12069,7 +12069,7 @@ EOF
+@@ -12083,7 +12083,7 @@ EOF
      dnl Checking for ant.jar
      if test "$ANT_HOME" != "NO_ANT_HOME"; then
          AC_MSG_CHECKING([Ant lib directory])
@@ -37,7 +46,7 @@ $NetBSD: patch-configure.ac,v 1.1 2015/08/12 00:57:20 ryoon Exp $
              ANT_LIB="$ANT_HOME/lib"
          else
              if test -f $ANT_HOME/ant.jar; then
-@@ -12513,7 +12513,7 @@ AC_SUBST(MANDIR)
+@@ -12527,7 +12527,7 @@ AC_SUBST(MANDIR)
  DOCDIR=[$(eval echo $(eval echo $docdir))]
  AC_SUBST(DOCDIR)