Fixed "test ==".

4 files changed, 31 insertions, 8 deletions

diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 411b804307b..760f678987e 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/09/30 12:24:45 obache Exp $
+# $NetBSD: Makefile,v 1.57 2006/10/14 02:24:46 rillig Exp $
 
 DISTNAME=	xemacs-21.5.27
 
@@ -63,6 +63,6 @@ CFLAGS+=		-fno-strict-aliasing
 INFO_FILES=		# PLIST
 
 post-patch:
-	@${RM} -f ${WRKSRC}/etc/ctags.1.orig
+	rm -f ${WRKSRC}/etc/ctags.1.orig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index fef0627df9c..9e148a1d7ab 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.17 2006/09/04 09:20:51 martin Exp $
+$NetBSD: distinfo,v 1.18 2006/10/14 02:24:46 rillig Exp $
 
 SHA1 (xemacs-21.5.27.tar.gz) = 55fc3e9c8fe3cac92791ffe1a0870aeae1baf0b8
 RMD160 (xemacs-21.5.27.tar.gz) = ee0caff8730c999d37aa3a19b19f23d5756837ad
 Size (xemacs-21.5.27.tar.gz) = 15042023 bytes
 SHA1 (patch-aa) = 5e099de33676099916771080c606046ca9acdac6
-SHA1 (patch-ab) = a9e74f1271150845eb858582e8f65a47c64c8c6b
+SHA1 (patch-ab) = c105e7333e5ed64eac1e99d49551e5bf75c0bc03
 SHA1 (patch-ac) = 9a480bf587e1b7e3fb15724433ca706f1848182e
 SHA1 (patch-ad) = 244ddfebb25ccca7b34b308cced61f256b50d0a7
 SHA1 (patch-ae) = 902a375f974e06eb5d67b69deadead98c625d97a
 SHA1 (patch-af) = e71e89be5ce6070bca4b4ab8456f92cf52c50c6e
 SHA1 (patch-ag) = f859010a113a9765819f92c79ce905cf4fd801dd
 SHA1 (patch-ah) = 53d806344f2429d26ee8a10005d1087d84fb0321
+SHA1 (patch-ai) = ed24c7c0cc802386c0293c34842882d5ec770426
diff --git a/editors/xemacs-current/patches/patch-ab b/editors/xemacs-current/patches/patch-ab
index 7d91c357c90..1e79eda2ecf 100644
--- a/editors/xemacs-current/patches/patch-ab
+++ b/editors/xemacs-current/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2006/09/04 09:20:51 martin Exp $
+$NetBSD: patch-ab,v 1.6 2006/10/14 02:24:46 rillig Exp $
 
 --- configure.orig	2006-05-16 06:16:04.000000000 +0200
-+++ configure	2006-08-30 17:46:21.000000000 +0200
-@@ -4415,7 +4415,7 @@
++++ configure	2006-10-14 04:23:09.000000000 +0200
+@@ -4415,7 +4415,7 @@ case "$ac_cv_build" in
      case "${ac_cv_build}" in
        i[3-9]86-*-netbsd*) machine=intel386 ;;
        hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2006/09/04 09:20:51 martin Exp $
        pc532-*-netbsd* | ns32k-*-netbsd* )  machine=ns32000 ;;
        pmax-*-netbsd*  | mips-*-netbsd*  )  machine=pmax ;;
      esac
-@@ -9735,7 +9735,7 @@
+@@ -9735,7 +9735,7 @@ echo $ECHO_N "checking for runtime libra
      decosf* | linux* | irix*) dash_r="-rpath " ;;
      *)
        dash_r=""
@@ -20,3 +20,12 @@ $NetBSD: patch-ab,v 1.5 2006/09/04 09:20:51 martin Exp $
          xe_check_libs="${try_dash_r}/no/such/file-or-directory"
  
  if test "$GCC" = "yes"; then
+@@ -39670,7 +39670,7 @@ fi
+ if test "$have_vdb_mach" = yes ; then
+   echo "  Using mach exception mechanism as vdb fault handler."
+ fi
+-if test "$have_vdb_fake" = yes && test "$enable_vdb" == fake; then
++if test "$have_vdb_fake" = yes && test "$enable_vdb" = fake; then
+   echo "  Virtual dirty bit write barrier manually disabled."
+ fi
+ test "$enable_pdump" = yes && echo "  Using the new portable dumper."
diff --git a/editors/xemacs-current/patches/patch-ai b/editors/xemacs-current/patches/patch-ai
new file mode 100644
index 00000000000..2a007b5fdfb
--- /dev/null
+++ b/editors/xemacs-current/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/10/14 02:24:46 rillig Exp $
+
+--- configure.ac.orig	2006-04-23 18:11:17.000000000 +0200
++++ configure.ac	2006-10-14 04:23:22.000000000 +0200
+@@ -6179,7 +6179,7 @@ fi
+ if test "$have_vdb_mach" = yes ; then
+   echo "  Using mach exception mechanism as vdb fault handler."
+ fi
+-if test "$have_vdb_fake" = yes && test "$enable_vdb" == fake; then
++if test "$have_vdb_fake" = yes && test "$enable_vdb" = fake; then
+   echo "  Virtual dirty bit write barrier manually disabled."
+ fi
+ test "$enable_pdump" = yes && echo "  Using the new portable dumper."