Attachment 33791 Details for Bug 55157 – file.diff

[patch] file.diff

file.diff (text/plain), 5.23 KB, created by tkato on 2003-08-01 16:40:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-08-01 16:40:15 UTC

Size: 5.23 KB

patch

obsolete

>diff -urN /usr/ports/sysutils/gnomefind/Makefile sysutils/gnomefind/Makefile
>--- /usr/ports/sysutils/gnomefind/Makefile	Tue Jul 29 21:33:27 2003
>+++ sysutils/gnomefind/Makefile	Thu Jul 31 23:34:12 2003
>@@ -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 @@
> 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 -urN /usr/ports/sysutils/gnomefind/distinfo sysutils/gnomefind/distinfo
>--- /usr/ports/sysutils/gnomefind/distinfo	Wed Jan 10 20:54:33 2001
>+++ sysutils/gnomefind/distinfo	Thu Jul 31 23:21:52 2003
>@@ -1 +1 @@
>-MD5 (gnome-find-1.0.1.tar.gz) = 30b6cfd8c5d929cadefb1ebbdd8ed328
>+MD5 (gnome-find-1.0.2.tar.gz) = fb6549efbab887efea88a8fcc4b4319f
>diff -urN /usr/ports/sysutils/gnomefind/files/patch-aa sysutils/gnomefind/files/patch-aa
>--- /usr/ports/sysutils/gnomefind/files/patch-aa	Mon Jul 17 16:08:19 2000
>+++ sysutils/gnomefind/files/patch-aa	Thu Jan  1 09:00:00 1970
>@@ -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 -urN /usr/ports/sysutils/gnomefind/files/patch-ab sysutils/gnomefind/files/patch-ab
>--- /usr/ports/sysutils/gnomefind/files/patch-ab	Mon Jul 17 16:08:19 2000
>+++ sysutils/gnomefind/files/patch-ab	Thu Jan  1 09:00:00 1970
>@@ -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 -urN /usr/ports/sysutils/gnomefind/files/patch-ac sysutils/gnomefind/files/patch-ac
>--- /usr/ports/sysutils/gnomefind/files/patch-ac	Tue Jun  6 21:52:06 2000
>+++ sysutils/gnomefind/files/patch-ac	Thu Jan  1 09:00:00 1970
>@@ -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 -urN /usr/ports/sysutils/gnomefind/files/patch-ae sysutils/gnomefind/files/patch-ae
>--- /usr/ports/sysutils/gnomefind/files/patch-ae	Fri Jun 30 17:27:07 2000
>+++ sysutils/gnomefind/files/patch-ae	Thu Jan  1 09:00:00 1970
>@@ -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 -urN /usr/ports/sysutils/gnomefind/files/patch-af sysutils/gnomefind/files/patch-af
>--- /usr/ports/sysutils/gnomefind/files/patch-af	Fri Jun 30 17:27:07 2000
>+++ sysutils/gnomefind/files/patch-af	Thu Jan  1 09:00:00 1970
>@@ -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 -urN /usr/ports/sysutils/gnomefind/pkg-plist sysutils/gnomefind/pkg-plist
>--- /usr/ports/sysutils/gnomefind/pkg-plist	Sat Aug  5 00:29:09 2000
>+++ sysutils/gnomefind/pkg-plist	Thu Jul 31 23:37:09 2003
>@@ -15,10 +15,20 @@
> 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

Actions: View | Diff

Attachments on bug 55157: 33791