Fixed "test ==".

5 files changed, 203 insertions, 5 deletions

diff --git a/net/amule/distinfo b/net/amule/distinfo
index 858150c4440..c4f9e41589e 100644
--- a/net/amule/distinfo
+++ b/net/amule/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2006/08/17 23:55:16 adam Exp $
+$NetBSD: distinfo,v 1.14 2006/10/14 01:14:15 rillig Exp $
 
 SHA1 (aMule-2.1.3.tar.bz2) = dd47deb38e7a5b823550b85150f5a814c597b273
 RMD160 (aMule-2.1.3.tar.bz2) = fcc345000e5ad0a221d1e96d0d514f3be36428c3
 Size (aMule-2.1.3.tar.bz2) = 3248530 bytes
-SHA1 (patch-aa) = 6490a8ffedcfa4e016e8911832458a7ee4c92b02
+SHA1 (patch-aa) = 7475073572410b0368ae34d26208eab243652488
 SHA1 (patch-ab) = df17202991dc5477feca2a0129d9703a71665869
diff --git a/net/amule/patches/patch-aa b/net/amule/patches/patch-aa
index bb563e3e502..8181d47007c 100644
--- a/net/amule/patches/patch-aa
+++ b/net/amule/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2006/08/17 23:55:16 adam Exp $
+$NetBSD: patch-aa,v 1.8 2006/10/14 01:14:15 rillig Exp $
 
 --- configure.orig	2006-06-11 17:08:53.000000000 +0200
-+++ configure
++++ configure	2006-10-14 03:13:01.000000000 +0200
 @@ -8227,6 +8227,7 @@ else
  	result="no"
  fi
@@ -19,3 +19,12 @@ $NetBSD: patch-aa,v 1.7 2006/08/17 23:55:16 adam Exp $
  		{ echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6; }
  	fi
+@@ -18962,7 +18963,7 @@ case "$ccache" in
+ 
+ yes)
+ 
+-	if test x$ccache_prefix == x ; then
++	if test x$ccache_prefix = x ; then
+ 		ccache_full=$(which ccache)
+ 		ccache_prefix=$(dirname ${ccache_full})
+ 	fi
diff --git a/net/ed2k-gtk-gui/distinfo b/net/ed2k-gtk-gui/distinfo
index b110f0c1982..a8701ca49ce 100644
--- a/net/ed2k-gtk-gui/distinfo
+++ b/net/ed2k-gtk-gui/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:45 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/10/14 01:21:48 rillig Exp $
 
 SHA1 (ed2k-gtk-gui-0.6.3.tar.gz) = b5474717b1b9cdeddae8cc707fe9809608138dc1
 RMD160 (ed2k-gtk-gui-0.6.3.tar.gz) = 98f69190e76b58b79aa3dd9a6d20b7abcb080208
 Size (ed2k-gtk-gui-0.6.3.tar.gz) = 1993079 bytes
 SHA1 (patch-aa) = d47d9302cd13a8ca3d9488f7e2563e0c33265e1d
+SHA1 (patch-ab) = 89dfaa0f27af6b8920e286b70e31ea97b9f68599
+SHA1 (patch-ac) = 2a16726d954f4ceb82e40f2e6993864aed79d0f2
diff --git a/net/ed2k-gtk-gui/patches/patch-ab b/net/ed2k-gtk-gui/patches/patch-ab
new file mode 100644
index 00000000000..a907695af5c
--- /dev/null
+++ b/net/ed2k-gtk-gui/patches/patch-ab
@@ -0,0 +1,99 @@
+$NetBSD: patch-ab,v 1.1 2006/10/14 01:21:48 rillig Exp $
+
+--- configure.orig	2006-10-14 03:19:13.000000000 +0200
++++ configure	2006-10-14 03:20:45.000000000 +0200
+@@ -4304,12 +4304,12 @@ else
+   enable_gnetopt=no
+ fi;
+ 
+-if test "x$enable_gnetopt" == "xyes"
++if test "x$enable_gnetopt" = "xyes"
+ then
+ 	want_gnet2_opt=yes
+ fi
+ 
+-if test "x$want_gnet2_opt" == "xyes"
++if test "x$want_gnet2_opt" = "xyes"
+ then
+ 
+   succeeded=no
+@@ -6653,7 +6653,7 @@ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   	LIBS="$gnet_save_LIBS $dash_pthread"
+ 
+-	  if test "x$dash_pthread" == "x"; then
++	  if test "x$dash_pthread" = "x"; then
+   	  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+ echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+@@ -6808,7 +6808,7 @@ fi
+ 
+ 
+ 
+-if test "x$want_gnet2_opt" == "xyes"; then
++if test "x$want_gnet2_opt" = "xyes"; then
+   GNET_OPT_TRUE=
+   GNET_OPT_FALSE='#'
+ else
+@@ -8802,7 +8802,7 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+ 
+ 
+-		if test "x$want_gnet2_opt" == "xyes"
++		if test "x$want_gnet2_opt" = "xyes"
+ 	then
+ 	  GTHREAD_CFLAGS="-no-cpp-precomp $GTHREAD_CFLAGS"
+ 	fi
+@@ -8894,7 +8894,7 @@ fi
+ 
+ 
+ 
+-if test "x$winos" == "xyes"; then
++if test "x$winos" = "xyes"; then
+   OS_WIN32_TRUE=
+   OS_WIN32_FALSE='#'
+ else
+@@ -8912,10 +8912,10 @@ else
+   enable_pollopt=no
+ fi;
+ 
+-if test "x$winos" == "xno"; then
+-    if test "x$have_sys_poll_h" == "xno"
++if test "x$winos" = "xno"; then
++    if test "x$have_sys_poll_h" = "xno"
+     then
+-	if test "x$have_poll_h" == "xno"
++	if test "x$have_poll_h" = "xno"
+ 	then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -8925,7 +8925,7 @@ _ACEOF
+ 	fi
+     fi
+ 
+-    if test "x$enable_pollopt" == "xyes"
++    if test "x$enable_pollopt" = "xyes"
+     then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -8956,7 +8956,7 @@ fi;
+ 
+ if test "x$enable_systray" != "xyes"; then
+   GUI_CFLAGS="-DGUI_DISABLE_SYSTRAY $GUI_CFLAGS"
+-  if test "x$systray_default" == "xyes"; then
++  if test "x$systray_default" = "xyes"; then
+ 	  { echo "$as_me:$LINENO: Systray icon:  DISABLED" >&5
+ echo "$as_me: Systray icon:  DISABLED" >&6;}
+   else
+@@ -8979,9 +8979,9 @@ echo "$as_me: Systray icon:  enabled (de
+ fi
+ 
+ 
+-if test "x$want_gnet2_opt" == "xyes"
++if test "x$want_gnet2_opt" = "xyes"
+ then
+-	if test "x$enable_gnetopt" == "xyes"
++	if test "x$enable_gnetopt" = "xyes"
+ 	then
+ 		{ echo "$as_me:$LINENO: Gnet2 library: build and link statically (--enable-static-gnet2 specified)" >&5
+ echo "$as_me: Gnet2 library: build and link statically (--enable-static-gnet2 specified)" >&6;}
diff --git a/net/ed2k-gtk-gui/patches/patch-ac b/net/ed2k-gtk-gui/patches/patch-ac
new file mode 100644
index 00000000000..322ebb60ead
--- /dev/null
+++ b/net/ed2k-gtk-gui/patches/patch-ac
@@ -0,0 +1,88 @@
+$NetBSD: patch-ac,v 1.1 2006/10/14 01:21:48 rillig Exp $
+
+--- configure.in.orig	2004-08-26 20:10:27.000000000 +0200
++++ configure.in	2006-10-14 03:20:03.000000000 +0200
+@@ -58,12 +58,12 @@ dnl ====================================
+ 
+ AC_ARG_ENABLE(static-gnet2, [  --enable-static-gnet2   build and use gnet2 as shipped with the GUI source code, even if gnet2 was found], enable_gnetopt=yes , enable_gnetopt=no)
+ 
+-if test "x$enable_gnetopt" == "xyes"
++if test "x$enable_gnetopt" = "xyes"
+ then
+ 	want_gnet2_opt=yes
+ fi
+ 
+-if test "x$want_gnet2_opt" == "xyes"
++if test "x$want_gnet2_opt" = "xyes"
+ then
+ 	PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.0.0, ,
+       [ AC_MSG_ERROR([pkg-config could not find gthread-2.0 >= 2.0.0. Do you have the glib-2.x development packages installed? You need the glib2 and the glib2-devel packages (libglib2.0-0 and libglib2.0-dev on debian).])])
+@@ -79,7 +79,7 @@ else
+   GTHREAD_CFLAGS=""
+ fi
+ 
+-AM_CONDITIONAL([GNET_OPT], [test "x$want_gnet2_opt" == "xyes"])
++AM_CONDITIONAL([GNET_OPT], [test "x$want_gnet2_opt" = "xyes"])
+ 
+ AC_SUBST([GTK_CFLAGS GTK_LIBS GNET_CFLAGS GNET_LIBS GTHREAD_CFLAGS GTHREAD_LIBS])
+ 
+@@ -152,7 +152,7 @@ darwin*)
+   AC_DEFINE(GNET_APPLE_DARWIN, 1, [Define if building on Apple Darwin])
+ 
+ 	dnl disable smart processing, see gnet's README.macosx
+-	if test "x$want_gnet2_opt" == "xyes"
++	if test "x$want_gnet2_opt" = "xyes"
+ 	then
+ 	  GTHREAD_CFLAGS="-no-cpp-precomp $GTHREAD_CFLAGS"
+ 	fi
+@@ -191,7 +191,7 @@ AC_SUBST([ICONS_CFLAGS I18N_CFLAGS GUI_C
+ 
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+ 
+-AM_CONDITIONAL([OS_WIN32], [test "x$winos" == "xyes"])
++AM_CONDITIONAL([OS_WIN32], [test "x$winos" = "xyes"])
+ 
+ 
+ AC_ARG_ENABLE(static-poll, [  --enable-static-poll    build and use libpoll as shipped with the GUI source code, even if poll.h was found], enable_pollopt=yes , enable_pollopt=no)
+@@ -200,16 +200,16 @@ dnl 
+ dnl Windows select works only for sockets
+ dnl so poll-emulator doesn't make sense
+ dnl 
+-if test "x$winos" == "xno"; then
+-    if test "x$have_sys_poll_h" == "xno"
++if test "x$winos" = "xno"; then
++    if test "x$have_sys_poll_h" = "xno"
+     then
+-	if test "x$have_poll_h" == "xno"
++	if test "x$have_poll_h" = "xno"
+ 	then
+ 		AC_DEFINE_UNQUOTED(USE_POLL_EMULATOR,1,[Use libpoll (poll-emulator.c) that ships with the GUI source code])
+ 	fi
+     fi
+ 
+-    if test "x$enable_pollopt" == "xyes"
++    if test "x$enable_pollopt" = "xyes"
+     then
+ 	AC_DEFINE_UNQUOTED(USE_POLL_EMULATOR,1,[Use libpoll (poll-emulator.c) that ships with the GUI source code])
+     fi
+@@ -228,7 +228,7 @@ AC_ARG_ENABLE(systray, [  --disable-syst
+ 
+ if test "x$enable_systray" != "xyes"; then
+   GUI_CFLAGS="-DGUI_DISABLE_SYSTRAY $GUI_CFLAGS"
+-  if test "x$systray_default" == "xyes"; then
++  if test "x$systray_default" = "xyes"; then
+ 	  AC_MSG_NOTICE([Systray icon:  DISABLED])
+   else
+ 		if test "x$macosx" = "xyes"; then
+@@ -246,9 +246,9 @@ else
+ fi
+ 
+ 
+-if test "x$want_gnet2_opt" == "xyes"
++if test "x$want_gnet2_opt" = "xyes"
+ then
+-	if test "x$enable_gnetopt" == "xyes"
++	if test "x$enable_gnetopt" = "xyes"
+ 	then
+ 		AC_MSG_NOTICE([Gnet2 library: build and link statically (--enable-static-gnet2 specified)])
+ 	else