first attempt to fix the search function; there are still a few other

cases but this makes search work much better.

net/amule/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2005/06/25 16:10:03 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2005/10/07 16:20:34 fgsch Exp $
 
 COMMENT=	"another eMule p2p client"
 
 DISTNAME=	aMule-2.0.3
-PKGNAME=	${DISTNAME:L}p0
+PKGNAME=	${DISTNAME:L}p1
 CATEGORIES=	net
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=amule/}

net/amule/patches/patch-docs_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-docs_Makefile_in,v 1.1.1.1 2005/06/07 17:24:49 fgsch Exp $
+$OpenBSD: patch-docs_Makefile_in,v 1.2 2005/10/07 16:20:34 fgsch Exp $
---- docs/Makefile.in.orig	Sat Jun  4 21:36:46 2005
+--- docs/Makefile.in.orig	Wed Jun 15 14:06:59 2005
-+++ docs/Makefile.in	Sat Jun  4 21:37:54 2005
++++ docs/Makefile.in	Sat Sep 24 17:55:07 2005
-@@ -319,7 +319,7 @@ dist_doc_DATA = ABOUT-NLS \
+@@ -320,7 +320,7 @@ dist_doc_DATA = ABOUT-NLS \
  		EC_Protocol.txt \
  		socks4.protocol
  

net/amule/patches/patch-src_OtherFunctions_cpp

@@ -0,0 +1,60 @@
+$OpenBSD: patch-src_OtherFunctions_cpp,v 1.1 2005/10/07 16:20:34 fgsch Exp $
+--- src/OtherFunctions.cpp.orig	Sat Sep 24 19:27:28 2005
++++ src/OtherFunctions.cpp	Sat Sep 24 19:32:51 2005
+@@ -235,49 +235,49 @@ wxString GetFiletypeDesc(FileType type, 
+ 			if (translated) {
+ 				return _("Videos");
+ 			} else {
+-				return wxT("Videos");
++				return ED2KFTSTR_VIDEO;
+ 			}
+ 			break;
+ 		case ftAudio:
+ 			if (translated) {
+ 				return _("Audio");
+ 			} else {
+-				return wxT("Audio");
++				return ED2KFTSTR_AUDIO;
+ 			}
+ 			break;			
+ 		case ftArchive:	
+ 			if (translated) {
+ 				return _("Archives");
+ 			} else {
+-				return wxT("Archives");
++				return ED2KFTSTR_ARCHIVE;
+ 			}
+ 			break;			
+ 		case ftCDImage:
+ 			if (translated) {
+ 				return _("CD-Images");
+ 			} else {
+-				return wxT("CD-Images");
++				return ED2KFTSTR_CDIMAGE;
+ 			}
+ 			break;			
+ 		case ftPicture:
+ 			if (translated) {
+ 				return _("Pictures");
+ 			} else {
+-				return wxT("Pictures");
++				return ED2KFTSTR_IMAGE;
+ 			}
+ 			break;			
+ 		case ftText:
+ 			if (translated) {
+ 				return _("Texts");
+ 			} else {
+-				return wxT("Texts");
++				return ED2KFTSTR_DOCUMENT;
+ 			}
+ 			break;			
+ 		case ftProgram:
+ 			if (translated) {
+ 				return _("Programs");
+ 			} else {
+-				return wxT("Programs");
++				return ED2KFTSTR_PROGRAM;
+ 			}
+ 			break;			
+ 		default:

net/amule/patches/patch-src_SearchDlg_cpp

@@ -0,0 +1,49 @@
+$OpenBSD: patch-src_SearchDlg_cpp,v 1.1 2005/10/07 16:20:34 fgsch Exp $
+--- src/SearchDlg.cpp.orig	Fri Apr  1 21:05:18 2005
++++ src/SearchDlg.cpp	Sat Sep 24 20:23:18 2005
+@@ -392,7 +392,7 @@ void CSearchDlg::StartNewSearch()
+ 		return;
+ 	}
+ 
+-	wxString typeText(wxT("Any")), extension;
++	wxString typeText(wxEmptyString), extension;
+ 	uint32 min = 0, max = 0, availability = 0;
+ 	
+ 	if (CastChild(ID_EXTENDEDSEARCHCHECK, wxCheckBox)->GetValue()) {
+@@ -418,28 +418,28 @@ void CSearchDlg::StartNewSearch()
+ 
+ 		switch ( CastChild( IDC_TypeSearch, wxChoice )->GetSelection() ) {
+ 			case 0: 
+-				typeText = wxT("Any"); 
++				typeText = wxEmptyString;
+ 				break;
+ 			case 1: 
+-				typeText = wxT("Archives"); 
++				typeText = ED2KFTSTR_ARCHIVE;
+ 				break;
+ 			case 2: 
+-				typeText = wxT("Audio"); 
++				typeText = ED2KFTSTR_AUDIO;
+ 				break;
+ 			case 3: 
+-				typeText = wxT("CD-Images"); 
++				typeText = ED2KFTSTR_CDIMAGE;
+ 				break;
+ 			case 4: 
+-				typeText = wxT("Pictures"); 
++				typeText = ED2KFTSTR_IMAGE;
+ 				break;
+ 			case 5: 
+-				typeText = wxT("Programs"); 
++				typeText = ED2KFTSTR_PROGRAM;
+ 				break;
+ 			case 6: 
+-				typeText = wxT("Texts"); 
++				typeText = ED2KFTSTR_DOCUMENT;
+ 				break;
+ 			case 7: 
+-				typeText = wxT("Videos"); 
++				typeText = ED2KFTSTR_VIDEO;
+ 				break;
+ 			default:
+ 				AddDebugLogLineM( true, logGeneral,

net/amule/patches/patch-src_SearchList_cpp

@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_SearchList_cpp,v 1.1 2005/10/07 16:20:34 fgsch Exp $
+--- src/SearchList.cpp.orig	Fri Apr  1 21:05:19 2005
++++ src/SearchList.cpp	Sat Sep 24 20:34:35 2005
+@@ -407,10 +407,10 @@ bool CSearchList::AddToList(CSearchFile*
+ 		delete toadd;
+ 		return false;
+ 	}
+-	
++
+ 	// If the result was not the type user wanted, drop it.
+ 	if (	!bClientResponse &&
+-		!(m_resultType == wxString(wxT("Any")) ||
++		!(m_resultType == wxEmptyString ||
+ 		GetFiletypeByName(toadd->GetFileName(), false) == m_resultType)) {
+ 		AddDebugLogLineM( false, logSearch,
+ 			CFormat( wxT("Dropped result type %s != %s, file %s") )