Fixed "test ==".

3 files changed, 82 insertions, 5 deletions

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.])