Fixed "test ==".

5 files changed, 92 insertions, 15 deletions

diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 846b06bcbc4..2aca4783790 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2006/07/31 02:07:13 kristerw Exp $
+$NetBSD: distinfo,v 1.16 2006/10/14 02:45:10 rillig Exp $
 
 SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c
 RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de
@@ -11,3 +11,4 @@ SHA1 (patch-ab) = ae5fea00aad1f524fe4d26f614873c6e42a26603
 SHA1 (patch-af) = e7432183001727b5c4b56260d0404fd782ad59af
 SHA1 (patch-ag) = 2b51360567c3742e1c9f57b3e01a5cc45f04d436
 SHA1 (patch-ah) = 243b1b98ce48873ded6c45dd0ff3541e8284bf00
+SHA1 (patch-ai) = 0bb721b104608f5274e08d7afd4e835e9cebbf37
diff --git a/lang/ghc/patches/patch-ai b/lang/ghc/patches/patch-ai
new file mode 100644
index 00000000000..5e0819774d6
--- /dev/null
+++ b/lang/ghc/patches/patch-ai
@@ -0,0 +1,62 @@
+$NetBSD: patch-ai,v 1.5 2006/10/14 02:45:10 rillig Exp $
+
+--- distrib/prep-bin-dist-mingw.orig	2006-03-19 04:26:18.000000000 +0100
++++ distrib/prep-bin-dist-mingw	2006-10-14 04:43:55.000000000 +0200
+@@ -27,25 +27,25 @@
+ #    - gcc_version -- what gcc version your mingw tree uses.
+ #
+ #
+-if [ "x${old_ghc_top}" == "x" ]; then
++if [ "x${old_ghc_top}" = "x" ]; then
+     export old_ghc_top=c:/ghc/ghc-6.2.1
+ fi
+-if [ "x${mingw_top}" == "x" ]; then
++if [ "x${mingw_top}" = "x" ]; then
+  export mingw_top=c:/mingw3
+ fi
+ 
+ # The gcc-lib directory of the mingw tree you want to
+ # include with the binary dist.
+-if [ "x${gcc_lib}" == "x" ]; then
+- if [ "x${gcc_version}" == "x" ]; then
++if [ "x${gcc_lib}" = "x" ]; then
++ if [ "x${gcc_version}" = "x" ]; then
+    # The default (with mingw3)
+    export gcc_lib=$mingw_top/lib/gcc-lib/mingw32/3.2.3
+  else
+    export gcc_lib=$mingw_top/lib/gcc-lib/mingw32/${gcc_version}
+  fi
+ fi
+-if [ "x${gcc_libexec}" == "x" ]; then
+- if [ "x${gcc_version}" == "x" ]; then
++if [ "x${gcc_libexec}" = "x" ]; then
++ if [ "x${gcc_version}" = "x" ]; then
+    # The default (with mingw3)
+    export gcc_libexec=$mingw_top/lib/gcc-lib/mingw32/3.2.3
+  else
+@@ -61,7 +61,7 @@ if [ "x${gcc_libexec}" == "x" ]; then
+ fi
+ 
+ #Directory where a (cygwin-free) perl binary resides.
+-if [ "x${perl_dir}" == "x" ]; then
++if [ "x${perl_dir}" = "x" ]; then
+   export perl_dir=$old_ghc_top
+ fi
+ 
+@@ -69,13 +69,13 @@ fi
+ # The mingw include, lib, and bin directories; all derived
+ # from ${mingw_top}.
+ #
+-if [ "x${mingw_include}" == "x" ]; then
++if [ "x${mingw_include}" = "x" ]; then
+   export mingw_include=$mingw_top/include
+ fi
+-if [ "x${mingw_lib}" == "x" ]; then
++if [ "x${mingw_lib}" = "x" ]; then
+   export mingw_lib=$mingw_top/lib
+ fi
+-if [ "x${mingw_bin}" == "x" ]; then
++if [ "x${mingw_bin}" = "x" ]; then
+   export mingw_bin=$mingw_top/bin
+ fi
+ 
diff --git a/sysutils/xfe/distinfo b/sysutils/xfe/distinfo
index 7a632ec2252..1d56d580ca0 100644
--- a/sysutils/xfe/distinfo
+++ b/sysutils/xfe/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/07/17 19:27:31 wiz Exp $
+$NetBSD: distinfo,v 1.6 2006/10/14 02:47:08 rillig Exp $
 
 SHA1 (xfe-0.88.tar.gz) = 85ea89fcb967f4d566ab68cbb80e49c7ea1e4c46
 RMD160 (xfe-0.88.tar.gz) = c208f1dd6e34710e1306394bdae96e9d37f0c739
 Size (xfe-0.88.tar.gz) = 973761 bytes
 SHA1 (patch-aa) = 094df6cbc885332c6364d8cd8a0a8fe6d6fdf281
-SHA1 (patch-ab) = 41b27f54e3b1487ecb5d893d2cf5ff210bb3976f
+SHA1 (patch-ab) = 1c4c62bd9058bd09d6bd79fd4a68d7633022d66e
+SHA1 (patch-ac) = c104348cf4be6f0095357080d2001530afe8b180
diff --git a/sysutils/xfe/patches/patch-ab b/sysutils/xfe/patches/patch-ab
index 105ac7aa885..0c698e90d7a 100644
--- a/sysutils/xfe/patches/patch-ab
+++ b/sysutils/xfe/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2006/07/03 14:15:29 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2006/10/14 02:47:08 rillig Exp $
 
---- configure.orig	2005-06-24 08:38:30.000000000 +0000
-+++ configure
+--- configure.orig	2006-01-31 14:33:42.000000000 +0100
++++ configure	2006-10-14 04:40:35.000000000 +0200
 @@ -10965,7 +10965,7 @@ if test "${ac_cv_lib_FOX_1_4_fxfindfox+s
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -20,12 +20,12 @@ $NetBSD: patch-ab,v 1.1 2006/07/03 14:15:29 joerg Exp $
  
  else
    { { echo "$as_me:$LINENO: error: \"libFOX-1.4 not found\"" >&5
-@@ -13950,6 +13950,8 @@ do
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    # Avoid regenerating for rechecks on pkgsrc
-+    exit 0
-     ac_cs_recheck=: ;;
-   --version | --vers* | -V )
-     echo "$ac_cs_version"; exit 0 ;;
+@@ -11830,7 +11830,7 @@ done
+ if test "${with_static+set}" = set; then
+   withval="$with_static"
+ 
+-		if test "x$withval" == "xyes" ; then
++		if test "x$withval" = "xyes" ; then
+ 						echo "$as_me:$LINENO: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
diff --git a/sysutils/xfe/patches/patch-ac b/sysutils/xfe/patches/patch-ac
new file mode 100644
index 00000000000..8e2c16b6563
--- /dev/null
+++ b/sysutils/xfe/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/10/14 02:47:08 rillig Exp $
+
+--- configure.in.orig	2006-01-31 14:31:55.000000000 +0100
++++ configure.in	2006-10-14 04:39:35.000000000 +0200
+@@ -47,7 +47,7 @@ dnl Checks if we have to statically link
+ AC_ARG_WITH(static,
+ 	[  --with-static[[=ARG]]    Statically link the program [[ARG=yes/no, default=no]]],
+ 	[
+-		if test "x$withval" == "xyes" ; then
++		if test "x$withval" = "xyes" ; then
+ 			dnl Locate X11 libraries and headers (used for static linking)
+ 			AC_PATH_X
+ 			AC_PATH_XTRA