* Remove redundant patches that were rolled into the GCC 2.95.x patch [1]

* Use gnomehack and remove another patch

Reminded by:	maintainer

5 files changed, 1 insertions, 78 deletions

diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 7989588b33ec..b2bc5f2d1d7a 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomevfs2
+USE_GNOME=	gnomehack gnomevfs2
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/devel/gnome-vfsmm/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfsmm/files/patch-libgnomevfs::Makefile.in
deleted file mode 100644
index d40ca03eabec..000000000000
--- a/devel/gnome-vfsmm/files/patch-libgnomevfs::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/Makefile.in.orig	Wed May 21 11:53:07 2003
-+++ libgnomevfs/Makefile.in	Wed May 21 11:53:30 2003
-@@ -153,7 +153,7 @@
- gnome_vfsmm_configdir = $(libdir)/gnome-vfsmm-2.0/include
- gnome_vfsmm_config_DATA = libgnomevfsmmconfig.h
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gnome-vfsmm-2.0.pc
- subdir = libgnomevfs
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
diff --git a/devel/gnome-vfsmm/files/patch-libgnomevfs::libgnomevfs::directory-handle.cc b/devel/gnome-vfsmm/files/patch-libgnomevfs::libgnomevfs::directory-handle.cc
deleted file mode 100644
index 0c3b32ea0b4c..000000000000
--- a/devel/gnome-vfsmm/files/patch-libgnomevfs::libgnomevfs::directory-handle.cc
+++ /dev/null
@@ -1,35 +0,0 @@
---- libgnomevfs/libgnomevfsmm/directory-handle.cc.orig	Thu Jun 19 11:43:18 2003
-+++ libgnomevfs/libgnomevfsmm/directory-handle.cc	Thu Jun 19 11:45:32 2003
-@@ -97,13 +97,13 @@
- 
- void DirectoryHandle::open(const Glib::ustring& text_uri, FileInfoOptions options) throw(exception)
- {
--  GnomeVFSResult result = gnome_vfs_directory_open(&gobj_, text_uri.c_str(), static_cast<GnomeVFSFileInfoOptions>(options) );
-+  GnomeVFSResult result = gnome_vfs_directory_open(&gobj_, text_uri.c_str(), GnomeVFSFileInfoOptions(options) );
-   handle_result(result);
- }
- 
- void DirectoryHandle::open(const Glib::RefPtr<const Uri>& uri, FileInfoOptions options) throw(exception)
- {
--  GnomeVFSResult result = gnome_vfs_directory_open_from_uri(&gobj_, const_cast<GnomeVFSURI*>(uri->gobj()), static_cast<GnomeVFSFileInfoOptions>(options) );
-+  GnomeVFSResult result = gnome_vfs_directory_open_from_uri(&gobj_, const_cast<GnomeVFSURI*>(uri->gobj()), GnomeVFSFileInfoOptions(options) );
-   handle_result(result);
- }
- 
-@@ -132,14 +132,14 @@
- void DirectoryHandle::visit(const Glib::ustring& uri, FileInfoOptions info_options, DirectoryVisitOptions visit_options, const SlotVisit& slot) throw(exception)
- {
-   SignalProxy_Visit proxy(slot);
--  GnomeVFSResult result = gnome_vfs_directory_visit(uri.c_str(), static_cast<GnomeVFSFileInfoOptions>(info_options), static_cast<GnomeVFSDirectoryVisitOptions>(visit_options), &SignalProxy_Visit::c_callback, &proxy);
-+  GnomeVFSResult result = gnome_vfs_directory_visit(uri.c_str(), GnomeVFSFileInfoOptions(info_options), GnomeVFSDirectoryVisitOptions(visit_options), &SignalProxy_Visit::c_callback, &proxy);
-   handle_result(result);
- }
- 
- void DirectoryHandle::visit(const Glib::RefPtr<const Uri>& uri, FileInfoOptions info_options, DirectoryVisitOptions visit_options, const SlotVisit& slot) throw(exception)
- {
-   SignalProxy_Visit proxy(slot);
--  GnomeVFSResult result = gnome_vfs_directory_visit_uri(const_cast<GnomeVFSURI*>(uri->gobj()), static_cast<GnomeVFSFileInfoOptions>(info_options), static_cast<GnomeVFSDirectoryVisitOptions>(visit_options), &SignalProxy_Visit::c_callback, &proxy);
-+  GnomeVFSResult result = gnome_vfs_directory_visit_uri(const_cast<GnomeVFSURI*>(uri->gobj()), GnomeVFSFileInfoOptions(info_options), GnomeVFSDirectoryVisitOptions(visit_options), &SignalProxy_Visit::c_callback, &proxy);
-   handle_result(result);
- }
-  
diff --git a/devel/gnome-vfsmm/files/patch-libgnomevfs::libgnomevfs::handle.cc b/devel/gnome-vfsmm/files/patch-libgnomevfs::libgnomevfs::handle.cc
deleted file mode 100644
index cd321c52c278..000000000000
--- a/devel/gnome-vfsmm/files/patch-libgnomevfs::libgnomevfs::handle.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomevfs/libgnomevfsmm/handle.cc.orig	Thu Jun 19 11:46:18 2003
-+++ libgnomevfs/libgnomevfsmm/handle.cc	Thu Jun 19 11:46:58 2003
-@@ -108,7 +108,7 @@
- Glib::RefPtr<FileInfo> Handle::get_file_info(const Glib::ustring& text_uri, FileInfoOptions options) throw(exception)
- {
-   GnomeVFSFileInfo* file_info = gnome_vfs_file_info_new();
--  GnomeVFSResult result = gnome_vfs_get_file_info(text_uri.c_str(), file_info, static_cast<GnomeVFSFileInfoOptions>(options));
-+  GnomeVFSResult result = gnome_vfs_get_file_info(text_uri.c_str(), file_info, GnomeVFSFileInfoOptions(options));
-   handle_result(result);
-   return Glib::wrap(file_info);
- }
-@@ -116,7 +116,7 @@
- Glib::RefPtr<FileInfo> Handle::get_file_info(FileInfoOptions options) const throw(exception)
- {
-   GnomeVFSFileInfo* file_info = gnome_vfs_file_info_new();
--  GnomeVFSResult result = gnome_vfs_get_file_info_from_handle(const_cast<GnomeVFSHandle*>(gobj()), file_info, static_cast<GnomeVFSFileInfoOptions>(options));
-+  GnomeVFSResult result = gnome_vfs_get_file_info_from_handle(const_cast<GnomeVFSHandle*>(gobj()), file_info, GnomeVFSFileInfoOptions(options));
-   handle_result(result);
-   return Glib::wrap(file_info);
- }
diff --git a/devel/gnome-vfsmm/files/patch-libgnomevfs::libgnomevfs::uri.cc b/devel/gnome-vfsmm/files/patch-libgnomevfs::libgnomevfs::uri.cc
deleted file mode 100644
index 39887bcec6aa..000000000000
--- a/devel/gnome-vfsmm/files/patch-libgnomevfs::libgnomevfs::uri.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/libgnomevfsmm/uri.cc.orig	Thu Jun 19 11:25:08 2003
-+++ libgnomevfs/libgnomevfsmm/uri.cc	Thu Jun 19 11:44:28 2003
-@@ -66,7 +66,7 @@
- Glib::RefPtr<FileInfo> Uri::get_file_info(FileInfoOptions options) const throw(exception)
- {
-   GnomeVFSFileInfo* file_info = gnome_vfs_file_info_new();
--  GnomeVFSResult result = gnome_vfs_get_file_info_uri(const_cast<GnomeVFSURI*>(gobj()), file_info, static_cast<GnomeVFSFileInfoOptions>(options));
-+  GnomeVFSResult result = gnome_vfs_get_file_info_uri(const_cast<GnomeVFSURI*>(gobj()), file_info, GnomeVFSFileInfoOptions(options));
-   handle_result(result);
-   return Glib::wrap(file_info);
- }