Fixed "test ==".

13 files changed, 169 insertions, 23 deletions

diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 344ca0478e1..19a8ff0aaee 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2006/06/26 15:24:34 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/10/14 02:21:21 rillig Exp $
 
 SHA1 (xcircuit-3.3.0.tgz) = ec3c0995fd4f8755a50d39e278ca0ab293705b38
 RMD160 (xcircuit-3.3.0.tgz) = 2f3621b5201ce4597a34a300a7111349825e3045
 Size (xcircuit-3.3.0.tgz) = 1308602 bytes
-SHA1 (patch-aa) = 18d6eb6a04e813c9923025de173d2019b0411a77
-SHA1 (patch-ab) = d1364d1b79f4060e5b8f7078490b7eb6bafdf26a
+SHA1 (patch-aa) = 6655ff2ee38253c4bbc19c477f9fcd9e3e68a4ed
+SHA1 (patch-ab) = 8f81ac0b8c0a2fceed052668cf4cf27a96915f9f
 SHA1 (patch-ac) = 1f84054174f790bd32d14eafa6a91444737795ff
diff --git a/cad/xcircuit/patches/patch-aa b/cad/xcircuit/patches/patch-aa
index 530c9f0f75e..07ad33ac81f 100644
--- a/cad/xcircuit/patches/patch-aa
+++ b/cad/xcircuit/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.7 2006/06/26 15:24:34 joerg Exp $
+$NetBSD: patch-aa,v 1.8 2006/10/14 02:21:22 rillig Exp $
 
---- configure.in.orig	2004-10-01 04:24:09.000000000 +0000
-+++ configure.in
+--- configure.in.orig	2004-10-01 06:24:09.000000000 +0200
++++ configure.in	2006-10-14 04:19:51.000000000 +0200
+@@ -255,7 +255,7 @@ xc_with_tk_libraries=""
+ AC_ARG_WITH(tcl,
+ [  --with-tcl=DIR          Find tclConfig.sh in DIR], [
+   xc_with_tcl=$withval
+-  if test "$withval" == "no" -o "$withval" == "NO"; then
++  if test "$withval" = "no" -o "$withval" = "NO"; then
+       xc_with_tcl=""
+   fi
+ ], ) 
 @@ -469,6 +469,7 @@ fi
  if test "x$xc_with_tcl" != "x" ; then
    . $tcl_config_sh
diff --git a/cad/xcircuit/patches/patch-ab b/cad/xcircuit/patches/patch-ab
index d95e6e8fbdd..c5676e09c4d 100644
--- a/cad/xcircuit/patches/patch-ab
+++ b/cad/xcircuit/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.7 2006/06/26 15:24:34 joerg Exp $
+$NetBSD: patch-ab,v 1.8 2006/10/14 02:21:22 rillig Exp $
 
---- configure.orig	2004-10-01 04:25:07.000000000 +0000
-+++ configure
+--- configure.orig	2004-10-01 06:25:07.000000000 +0200
++++ configure	2006-10-14 04:20:29.000000000 +0200
+@@ -7393,7 +7393,7 @@ if test "${with_tcl+set}" = set; then
+   withval="$with_tcl"
+ 
+   xc_with_tcl=$withval
+-  if test "$withval" == "no" -o "$withval" == "NO"; then
++  if test "$withval" = "no" -o "$withval" = "NO"; then
+       xc_with_tcl=""
+   fi
+ 
 @@ -7629,6 +7629,7 @@ fi
  if test "x$xc_with_tcl" != "x" ; then
    . $tcl_config_sh
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."
diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo
index 4aaa91dedc5..b95499ed266 100644
--- a/security/xmlsec1/distinfo
+++ b/security/xmlsec1/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/01/05 19:00:11 joerg Exp $
+$NetBSD: distinfo,v 1.4 2006/10/14 02:26:39 rillig Exp $
 
 SHA1 (xmlsec1-1.2.6.tar.gz) = de5b7a70825d96ee9ee7e1aa43194df8412cf72d
 RMD160 (xmlsec1-1.2.6.tar.gz) = bdc7692be5c4f4c27c177fe5271b13382a44d452
 Size (xmlsec1-1.2.6.tar.gz) = 1595648 bytes
 SHA1 (patch-aa) = 1718c051201bf7803057b2a8ad7b004f90e35147
+SHA1 (patch-ab) = c44049b2592b03823dbbebc70ee5cb4a58adb646
+SHA1 (patch-ac) = 550f37db0db36ce5fa88c6c0d0acd6725aa69470
diff --git a/security/xmlsec1/patches/patch-ab b/security/xmlsec1/patches/patch-ab
new file mode 100644
index 00000000000..e1d76ae21eb
--- /dev/null
+++ b/security/xmlsec1/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/10/14 02:26:39 rillig Exp $
+
+--- configure.orig	2004-08-26 08:00:34.000000000 +0200
++++ configure	2006-10-14 04:22:49.000000000 +0200
+@@ -25371,7 +25371,7 @@ fi
+ 
+ 
+ 
+-if test "z$XMLSEC_NO_OPENSSL" == "z1"; then
++if test "z$XMLSEC_NO_OPENSSL" = "z1"; then
+   XMLSEC_NO_OPENSSL_TRUE=
+   XMLSEC_NO_OPENSSL_FALSE='#'
+ else
diff --git a/security/xmlsec1/patches/patch-ac b/security/xmlsec1/patches/patch-ac
new file mode 100644
index 00000000000..2f368ce99ce
--- /dev/null
+++ b/security/xmlsec1/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/10/14 02:26:39 rillig Exp $
+
+--- configure.in.orig	2004-08-26 04:49:24.000000000 +0200
++++ configure.in	2006-10-14 04:21:57.000000000 +0200
+@@ -390,7 +390,7 @@ else
+     XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl"
+ fi
+ 
+-AM_CONDITIONAL(XMLSEC_NO_OPENSSL, test "z$XMLSEC_NO_OPENSSL" == "z1")
++AM_CONDITIONAL(XMLSEC_NO_OPENSSL, test "z$XMLSEC_NO_OPENSSL" = "z1")
+ AC_SUBST(XMLSEC_NO_OPENSSL)
+ AC_SUBST(OPENSSL_CFLAGS)
+ AC_SUBST(OPENSSL_LIBS)
diff --git a/sysutils/tkdesk/distinfo b/sysutils/tkdesk/distinfo
index 6d82ae856b2..825adf3d29f 100644
--- a/sysutils/tkdesk/distinfo
+++ b/sysutils/tkdesk/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.6 2006/04/21 12:09:57 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/10/14 02:18:37 rillig Exp $
 
 SHA1 (tkdesk-2.0.tar.gz) = 6ee7e290c094a957b92647fa83e23b0765556bf7
 RMD160 (tkdesk-2.0.tar.gz) = bd3983465e44aa0c294d1936fc5f3f450535d9c2
 Size (tkdesk-2.0.tar.gz) = 907432 bytes
-SHA1 (patch-aa) = c4ce261aa0032a6ff41cbd4d615aca0d9592be35
+SHA1 (patch-aa) = d244a1e004247081b049156457d66c1952668a13
 SHA1 (patch-ab) = 0250bf748da921d25b2c0e96841f3fbed42fd96e
 SHA1 (patch-ac) = 286a2bb4177431f87b778ed943cd57961aeb48ab
 SHA1 (patch-ae) = c09cd944af50c2a31020a7478c1568e847b0cb02
 SHA1 (patch-aj) = 5ad17e6634f626e56f83c51a6ca9ee66b21aee16
 SHA1 (patch-ak) = 441a1eefd5872786981b25aa07482a8d6d9515aa
+SHA1 (patch-al) = 70a7a20f9e983ef1b31675631c5a7dd26e03b026
diff --git a/sysutils/tkdesk/patches/patch-aa b/sysutils/tkdesk/patches/patch-aa
index 5204936d2a5..662bca198e0 100644
--- a/sysutils/tkdesk/patches/patch-aa
+++ b/sysutils/tkdesk/patches/patch-aa
@@ -1,7 +1,43 @@
-$NetBSD: patch-aa,v 1.2 2005/10/26 04:29:01 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2006/10/14 02:18:37 rillig Exp $
 
---- configure.orig	2004-04-13 22:39:47.000000000 -0500
-+++ configure
+--- configure.orig	2004-04-14 05:39:47.000000000 +0200
++++ configure	2006-10-14 04:17:03.000000000 +0200
+@@ -1430,7 +1430,7 @@ TK_LIB_STATIC=${TKCONF_PATH}/libtk${TK_V
+ # Check for the TkStep libraries (if needed)...
+ #
+ 
+-if test "$ENABLE_TKSTEP" == "yes" ; then
++if test "$ENABLE_TKSTEP" = "yes" ; then
+   TK_LIB_SPEC="-ltkstep -lXpm -ltiff"
+   { echo "$as_me:$LINENO: will link using TkStep libraries" >&5
+ echo "$as_me: will link using TkStep libraries" >&6;}
+@@ -1446,7 +1446,7 @@ echo "$as_me:$LINENO: result: $TCL_VERSI
+ echo "${ECHO_T}$TCL_VERSION" >&6
+ if test "$TCL_MAJOR_VERSION" -lt 8; then
+    echo
+-   if test "$ENABLE_UNSUPPORTED" == "yes" ; then
++   if test "$ENABLE_UNSUPPORTED" = "yes" ; then
+       { echo "$as_me:$LINENO: WARNING: you may be attempting to use TkDesk 2.x with an unsupported version of Tcl.  Good luck.  Hope it works out for you." >&5
+ echo "$as_me: WARNING: you may be attempting to use TkDesk 2.x with an unsupported version of Tcl.  Good luck.  Hope it works out for you." >&2;}
+    else
+@@ -1462,7 +1462,7 @@ echo "$as_me:$LINENO: result: $TK_VERSIO
+ echo "${ECHO_T}$TK_VERSION" >&6
+ if test "$TK_MAJOR_VERSION" -lt 8; then
+    echo
+-   if test "$ENABLE_UNSUPPORTED" == "yes" ; then
++   if test "$ENABLE_UNSUPPORTED" = "yes" ; then
+       { echo "$as_me:$LINENO: WARNING: you may be attempting to use TkDesk 2.x with an unsupported version of Tk.  Good luck.  Hope it works out for you." >&5
+ echo "$as_me: WARNING: you may be attempting to use TkDesk 2.x with an unsupported version of Tk.  Good luck.  Hope it works out for you." >&2;}
+    else
+@@ -1505,7 +1505,7 @@ echo $ECHO_N "checking version of Itcl..
+ echo "${ECHO_T}$ITCL_VERSION" >&6
+    if test "$ITCL_MAJOR_VERSION" -ne 3; then
+       echo
+-      if test "$ENABLE_UNSUPPORTED" == "yes" ; then
++      if test "$ENABLE_UNSUPPORTED" = "yes" ; then
+ 	 { echo "$as_me:$LINENO: WARNING: you may be attempting to use TkDesk 2.x with an unsupported version of Itcl.  Good luck.  Hope it works out for you." >&5
+ echo "$as_me: WARNING: you may be attempting to use TkDesk 2.x with an unsupported version of Itcl.  Good luck.  Hope it works out for you." >&2;}
+       else
 @@ -1548,10 +1548,10 @@ else
       ITCL_LIB_SPEC="-L${TCLCONF_PATH} -litcl3.1"
       ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl3.1.a
diff --git a/sysutils/tkdesk/patches/patch-al b/sysutils/tkdesk/patches/patch-al
new file mode 100644
index 00000000000..5d57a6d8424
--- /dev/null
+++ b/sysutils/tkdesk/patches/patch-al
@@ -0,0 +1,40 @@
+$NetBSD: patch-al,v 1.1 2006/10/14 02:18:37 rillig Exp $
+
+--- configure.in.orig	2004-04-14 05:39:12.000000000 +0200
++++ configure.in	2006-10-14 04:16:47.000000000 +0200
+@@ -107,7 +107,7 @@ TK_LIB_STATIC=${TKCONF_PATH}/libtk${TK_V
+ # Check for the TkStep libraries (if needed)...
+ #
+ 
+-if test "$ENABLE_TKSTEP" == "yes" ; then
++if test "$ENABLE_TKSTEP" = "yes" ; then
+   TK_LIB_SPEC="-ltkstep -lXpm -ltiff"
+   AC_MSG_NOTICE([will link using TkStep libraries])
+ fi
+@@ -120,7 +120,7 @@ AC_MSG_CHECKING(version of Tcl)
+ AC_MSG_RESULT($TCL_VERSION)
+ if test "$TCL_MAJOR_VERSION" -lt 8; then
+    echo
+-   if test "$ENABLE_UNSUPPORTED" == "yes" ; then
++   if test "$ENABLE_UNSUPPORTED" = "yes" ; then
+       AC_MSG_WARN([you may be attempting to use TkDesk 2.x with an unsupported version of Tcl.  Good luck.  Hope it works out for you.])
+    else
+       AC_MSG_ERROR([TkDesk version 2.x requires Tcl version 8 or higher.  Please upgrade your Tcl or, if that is not possible, you might prefer to use TkDesk version 1.2 instead.])
+@@ -131,7 +131,7 @@ AC_MSG_CHECKING(version of Tk)
+ AC_MSG_RESULT($TK_VERSION)
+ if test "$TK_MAJOR_VERSION" -lt 8; then
+    echo
+-   if test "$ENABLE_UNSUPPORTED" == "yes" ; then
++   if test "$ENABLE_UNSUPPORTED" = "yes" ; then
+       AC_MSG_WARN([you may be attempting to use TkDesk 2.x with an unsupported version of Tk.  Good luck.  Hope it works out for you.])
+    else
+       AC_MSG_ERROR([TkDesk version 2.x requires Tk version 8 or higher.  Please upgrade your Tk or, if that is not possible, you might prefer to use TkDesk version 1.2 instead.])
+@@ -167,7 +167,7 @@ if test $success = 1 ; then
+    AC_MSG_RESULT($ITCL_VERSION)
+    if test "$ITCL_MAJOR_VERSION" -ne 3; then
+       echo
+-      if test "$ENABLE_UNSUPPORTED" == "yes" ; then
++      if test "$ENABLE_UNSUPPORTED" = "yes" ; then
+ 	 AC_MSG_WARN([you may be attempting to use TkDesk 2.x with an unsupported version of Itcl.  Good luck.  Hope it works out for you.])
+       else
+ 	 AC_MSG_ERROR([found Itcl, but it appears to be the wrong version.  TkDesk 2.x requires itcl 3.x to be installed.  Please get it from: http://www.incrtcl.sourceforge.net.])