- Update to version 1.0.2

PR:		55157
Submitted by:	Ports Fury
Approved by:	fjoe (mentor) (implicit)

8 files changed, 16 insertions, 75 deletions

diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile
index 0e2cc3659008..a3191910452f 100644
--- a/sysutils/gnomefind/Makefile
+++ b/sysutils/gnomefind/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomefind
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.0.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-find
@@ -17,19 +16,15 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical version of the GNU "find" utility
 
 USE_X_PREFIX=	yes
-USE_XPM=	yes
-USE_GNOME=	yes
+USE_GNOME=	gnomehack gnomeprefix libglade
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-lgnuregex -L${LOCALBASE}/lib"
 
 MAN1=		gnome-find.1
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+post-patch:
+	@${GREP} -lR "<regex\.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+		's|<regex\.h>|<gnuregex.h>|g'
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnomefind/distinfo b/sysutils/gnomefind/distinfo
index a15a28911814..26cdb5f11f08 100644
--- a/sysutils/gnomefind/distinfo
+++ b/sysutils/gnomefind/distinfo
@@ -1 +1 @@
-MD5 (gnome-find-1.0.1.tar.gz) = 30b6cfd8c5d929cadefb1ebbdd8ed328
+MD5 (gnome-find-1.0.2.tar.gz) = fb6549efbab887efea88a8fcc4b4319f
diff --git a/sysutils/gnomefind/files/patch-aa b/sysutils/gnomefind/files/patch-aa
deleted file mode 100644
index 4e7fdd3bec4c..000000000000
--- a/sysutils/gnomefind/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/defs.h.orig	Fri Jun 30 17:13:19 2000
-+++ src/defs.h	Mon Jul 17 09:56:51 2000
-@@ -43,7 +43,7 @@
- #include <time.h>
- 
- #ifdef HAVE_GNU_REGEX
--# include <regex.h>
-+# include <gnuregex.h>
- #else
- # include "gnu_regex.h"
- #endif
diff --git a/sysutils/gnomefind/files/patch-ab b/sysutils/gnomefind/files/patch-ab
deleted file mode 100644
index 8ec06ffc8e7d..000000000000
--- a/sysutils/gnomefind/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pred.h.orig	Fri Jun 30 17:13:50 2000
-+++ src/pred.h	Mon Jul 17 09:58:18 2000
-@@ -31,7 +31,7 @@
- #include <time.h>
- 
- #ifdef HAVE_GNU_REGEX
--# include <regex.h>
-+# include <gnuregex.h>
- #else
- # include "gnu_regex.h"
- #endif
diff --git a/sysutils/gnomefind/files/patch-ac b/sysutils/gnomefind/files/patch-ac
deleted file mode 100644
index 21bbb371e142..000000000000
--- a/sysutils/gnomefind/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/fstype.c	2000/05/26 09:54:55	1.1
-+++ src/fstype.c	2000/05/26 10:08:03
-@@ -318,7 +318,7 @@
-   char *p;
- 
-   if (S_ISLNK (statp->st_mode))
--    p = dirname (relpath);
-+    readlink(relpath, (p = malloc(MAXPATHLEN)), MAXPATHLEN);
-   else
-     p = relpath;
- 
-@@ -332,7 +332,7 @@
-   else
-     {
- #ifdef MFSNAMELEN		/* NetBSD.  */
--      type = xstrdup (fss.f_fstypename);
-+      type = strdup (fss.f_fstypename);
- #else
-       type = fstype_to_string (fss.f_type);
- #endif
diff --git a/sysutils/gnomefind/files/patch-ae b/sysutils/gnomefind/files/patch-ae
deleted file mode 100644
index a46e6928f699..000000000000
--- a/sysutils/gnomefind/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/parser.c.orig	Wed Jun 21 10:27:44 2000
-+++ src/parser.c	Fri Jun 30 10:14:46 2000
-@@ -24,7 +24,7 @@
- #include <pwd.h>
- #include <grp.h>
- #ifdef HAVE_GNU_REGEX
--#include <regex.h>
-+#include <gnuregex.h>
- #else
- #include "gnu_regex.h"
- #endif
diff --git a/sysutils/gnomefind/files/patch-af b/sysutils/gnomefind/files/patch-af
deleted file mode 100644
index 85cda4a39c1d..000000000000
--- a/sysutils/gnomefind/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Jun 30 10:13:20 2000
-+++ configure	Fri Jun 30 10:13:51 2000
-@@ -3344,7 +3344,7 @@
- cat > conftest.$ac_ext <<EOF
- #line 3346 "configure"
- #include "confdefs.h"
--#include <regex.h>
-+#include <gnuregex.h>
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   egrep "re_pattern_buffer" >/dev/null 2>&1; then
diff --git a/sysutils/gnomefind/pkg-plist b/sysutils/gnomefind/pkg-plist
index 88935529ee37..e0f6d8a78ff6 100644
--- a/sysutils/gnomefind/pkg-plist
+++ b/sysutils/gnomefind/pkg-plist
@@ -15,10 +15,20 @@ share/gnome/help/gnome-find/C/prefs-2.html
 share/gnome/help/gnome-find/C/prefs-3.html
 share/gnome/help/gnome-find/C/prefs-4.html
 share/gnome/help/gnome-find/C/topic.dat
+share/locale/da/LC_MESSAGES/gnome-find.mo
 share/locale/de/LC_MESSAGES/gnome-find.mo
 share/locale/es/LC_MESSAGES/gnome-find.mo
+share/locale/fi/LC_MESSAGES/gnome-find.mo
+share/locale/hu/LC_MESSAGES/gnome-find.mo
+share/locale/ja/LC_MESSAGES/gnome-find.mo
 share/locale/ko/LC_MESSAGES/gnome-find.mo
+share/locale/nl/LC_MESSAGES/gnome-find.mo
+share/locale/no/LC_MESSAGES/gnome-find.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-find.mo
 share/locale/ru/LC_MESSAGES/gnome-find.mo
+share/locale/sk/LC_MESSAGES/gnome-find.mo
+share/locale/sv/LC_MESSAGES/gnome-find.mo
+share/locale/uk/LC_MESSAGES/gnome-find.mo
 @dirrm share/gnome/help/gnome-find/C
 @dirrm share/gnome/help/gnome-find
 @dirrm share/gnome/gnome-find