- Update to 0.6.2

- xsearch has been renamed into searchmonkey

Repocopy by:	marcus

7 files changed, 8 insertions, 56 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index dee57842875e..b0c9dc6229b9 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -538,6 +538,7 @@
     SUBDIR += scanbuttond
     SUBDIR += screen
     SUBDIR += sdd
+    SUBDIR += searchmonkey
     SUBDIR += sec
     SUBDIR += sensors-applet
     SUBDIR += serpentine
@@ -701,7 +702,6 @@
     SUBDIR += xosview
     SUBDIR += xperfmon
     SUBDIR += xperfmon3
-    SUBDIR += xsearch
     SUBDIR += xstow
     SUBDIR += xsu
     SUBDIR += xsysinfo
diff --git a/sysutils/searchmonkey/Makefile b/sysutils/searchmonkey/Makefile
index fb7243932196..e479b382344c 100644
--- a/sysutils/searchmonkey/Makefile
+++ b/sysutils/searchmonkey/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:	xsearch
+# New ports collection makefile for:	searchmonkey
 # Date created:		26 August 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	searchMonkey
-PORTVERSION=	0.6.0
+PORTNAME=	searchmonkey
+PORTVERSION=	0.6.2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -19,7 +19,7 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-PLIST_FILES=	bin/${PORTNAME:L} %%DATADIR%%/pixmaps/${PORTNAME:L}-32x32.png
+PLIST_FILES=	bin/${PORTNAME} %%DATADIR%%/pixmaps/${PORTNAME}-32x32.png
 PLIST_DIRS=	%%DATADIR%%/pixmaps %%DATADIR%%
 CFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=-L${LOCALBASE}/lib
diff --git a/sysutils/searchmonkey/distinfo b/sysutils/searchmonkey/distinfo
index 3678187ea6b8..23d3df95b7b0 100644
--- a/sysutils/searchmonkey/distinfo
+++ b/sysutils/searchmonkey/distinfo
@@ -1,3 +1,3 @@
-MD5 (searchMonkey-0.6.0.tar.gz) = d34aa5677c905601bcc50c57b5affc51
-SHA256 (searchMonkey-0.6.0.tar.gz) = c0e10d02883e3ca627a7495c471e7a09e0a64ca98d14f4f5ecf2f15c7ac7aa43
-SIZE (searchMonkey-0.6.0.tar.gz) = 165815
+MD5 (searchmonkey-0.6.2.tar.gz) = ed0ca1cfac8097b33753318a0ac78922
+SHA256 (searchmonkey-0.6.2.tar.gz) = ab485f751371978f7933c3b19e1ad9b6191103b25c8b08ac0e06109c656c4f67
+SIZE (searchmonkey-0.6.2.tar.gz) = 167185
diff --git a/sysutils/xsearch/Makefile b/sysutils/xsearch/Makefile
deleted file mode 100644
index fb7243932196..000000000000
--- a/sysutils/xsearch/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	xsearch
-# Date created:		26 August 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	searchMonkey
-PORTVERSION=	0.6.0
-CATEGORIES=	sysutils
-MASTER_SITES=	SF
-
-MAINTAINER=	infofarmer@FreeBSD.org
-COMMENT=	Search using regexes for file names and text
-
-USE_GNOME=	gtk20
-USE_GCC=	3.3+
-USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-PLIST_FILES=	bin/${PORTNAME:L} %%DATADIR%%/pixmaps/${PORTNAME:L}-32x32.png
-PLIST_DIRS=	%%DATADIR%%/pixmaps %%DATADIR%%
-CFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=-L${LOCALBASE}/lib
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=	does not compile on 4.x
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/xsearch/distinfo b/sysutils/xsearch/distinfo
deleted file mode 100644
index 3678187ea6b8..000000000000
--- a/sysutils/xsearch/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (searchMonkey-0.6.0.tar.gz) = d34aa5677c905601bcc50c57b5affc51
-SHA256 (searchMonkey-0.6.0.tar.gz) = c0e10d02883e3ca627a7495c471e7a09e0a64ca98d14f4f5ecf2f15c7ac7aa43
-SIZE (searchMonkey-0.6.0.tar.gz) = 165815
diff --git a/sysutils/xsearch/files/patch-src__search.h b/sysutils/xsearch/files/patch-src__search.h
deleted file mode 100644
index e5a6baf9063a..000000000000
--- a/sysutils/xsearch/files/patch-src__search.h
+++ /dev/null
@@ -1,7 +0,0 @@
---- ./src/search.h.orig	Wed Aug 30 17:40:29 2006
-+++ ./src/search.h	Wed Aug 30 17:40:40 2006
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <gtk/gtk.h>
- #include <regex.h>
- 
diff --git a/sysutils/xsearch/pkg-descr b/sysutils/xsearch/pkg-descr
deleted file mode 100644
index dd3694f6ce46..000000000000
--- a/sysutils/xsearch/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Powerful text searches on Unix using regular expressions for both the
-file name, and the search text. Graphical equivalent of find + grep.
-
-WWW: http://searchmonkey.sourceforge.net/
-Author: Adam Cottrell <cottrela@users.sourceforge.net>