Update gnome-vfs to 1.0.5. Changes include:

New features:

* UTF-8 gnome-mime-data support
* NNTP module
* Share MIME data with GnomeVFS2 using gnome-mime-data, no NetBSD-specific
  patch necessary any longer

Bug fixes:

* NNTP fixes
* Large file (64bit) support
* Build fixes
* C++ style comments corrected
* Miscelaneous fixes
* Fix memory leak for nested symlinks, avoid infite loop
* Detect OpenSSL libraries better
* Don't include <regex.h> to remove namespace clashes

7 files changed, 42 insertions, 194 deletions

diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 4f7d2842b52..38981c86af5 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2003/01/02 03:19:32 rh Exp $
+# $NetBSD: Makefile,v 1.25 2003/01/09 09:47:30 rh Exp $
 
-DISTNAME=		gnome-vfs-1.0.3
-PKGREVISION=		1
+DISTNAME=		gnome-vfs-1.0.5
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/1.0/}
 
@@ -12,7 +11,6 @@ COMMENT=		GNOME Virtual File System
 BUILD_USES_MSGFMT=	YES
 BUILDLINK_DEPENDS.gnome-mime-data=	gnome-mime-data>=2.0.1
 
-AUTOMAKE_REQD=		1.4
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
@@ -21,13 +19,9 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-pre-configure:
-	cd ${WRKSRC} && ${AUTOMAKE}
-
 .include "../../archivers/bzip2/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
 .include "../../databases/gnome-mime-data/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf/buildlink2.mk"
-
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs/PLIST b/sysutils/gnome-vfs/PLIST
index 9339304eaf8..e88d47a1025 100644
--- a/sysutils/gnome-vfs/PLIST
+++ b/sysutils/gnome-vfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/01/02 03:19:32 rh Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/01/09 09:47:30 rh Exp $
 bin/gnome-vfs-config
 etc/vfs/modules/default-modules.conf
 include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-application-registry.h
@@ -48,6 +48,7 @@ include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-uri.h
 include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-utils.h
 include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-xfer.h
 include/gnome-vfs-1.0/libgnomevfs/gnome-vfs.h
+lib/charset.alias
 lib/gnome-vfs-1.0/include/gnome-vfs-file-size.h
 lib/libgnomevfs-pthread.a
 lib/libgnomevfs-pthread.la
@@ -89,15 +90,15 @@ lib/vfs/modules/libfile.so
 lib/vfs/modules/libftp.a
 lib/vfs/modules/libftp.la
 lib/vfs/modules/libftp.so
-lib/vfs/modules/libgconf.a
-lib/vfs/modules/libgconf.la
-lib/vfs/modules/libgconf.so
 lib/vfs/modules/libgzip.a
 lib/vfs/modules/libgzip.la
 lib/vfs/modules/libgzip.so
 lib/vfs/modules/libhttp.a
 lib/vfs/modules/libhttp.la
 lib/vfs/modules/libhttp.so
+lib/vfs/modules/libnntp.a
+lib/vfs/modules/libnntp.la
+lib/vfs/modules/libnntp.so
 lib/vfs/modules/libvfs-pipe.a
 lib/vfs/modules/libvfs-pipe.la
 lib/vfs/modules/libvfs-pipe.so
@@ -108,36 +109,37 @@ lib/vfs/modules/libvfs-translate.a
 lib/vfs/modules/libvfs-translate.la
 lib/vfs/modules/libvfs-translate.so
 lib/vfsConf.sh
-share/locale/az/LC_MESSAGES/gnome-vfs.mo
-share/locale/ca/LC_MESSAGES/gnome-vfs.mo
-share/locale/da/LC_MESSAGES/gnome-vfs.mo
-share/locale/de/LC_MESSAGES/gnome-vfs.mo
-share/locale/el/LC_MESSAGES/gnome-vfs.mo
-share/locale/es/LC_MESSAGES/gnome-vfs.mo
-share/locale/fi/LC_MESSAGES/gnome-vfs.mo
-share/locale/fr/LC_MESSAGES/gnome-vfs.mo
-share/locale/ga/LC_MESSAGES/gnome-vfs.mo
-share/locale/gl/LC_MESSAGES/gnome-vfs.mo
-share/locale/hu/LC_MESSAGES/gnome-vfs.mo
-share/locale/it/LC_MESSAGES/gnome-vfs.mo
-share/locale/ja/LC_MESSAGES/gnome-vfs.mo
-share/locale/ko/LC_MESSAGES/gnome-vfs.mo
-share/locale/lt/LC_MESSAGES/gnome-vfs.mo
-share/locale/nl/LC_MESSAGES/gnome-vfs.mo
-share/locale/nn/LC_MESSAGES/gnome-vfs.mo
-share/locale/no/LC_MESSAGES/gnome-vfs.mo
-share/locale/pl/LC_MESSAGES/gnome-vfs.mo
-share/locale/pt/LC_MESSAGES/gnome-vfs.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-vfs.mo
-share/locale/ro/LC_MESSAGES/gnome-vfs.mo
-share/locale/ru/LC_MESSAGES/gnome-vfs.mo
-share/locale/sk/LC_MESSAGES/gnome-vfs.mo
-share/locale/sl/LC_MESSAGES/gnome-vfs.mo
-share/locale/sv/LC_MESSAGES/gnome-vfs.mo
-share/locale/tr/LC_MESSAGES/gnome-vfs.mo
-share/locale/uk/LC_MESSAGES/gnome-vfs.mo
-share/locale/wa/LC_MESSAGES/gnome-vfs.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-vfs.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-vfs.mo
 @exec ${MKDIR} %D/share/gtk-doc/html/gnome-vfs
 @dirrm share/gtk-doc/html/gnome-vfs
 @dirrm lib/vfs/modules
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index 9d391e7cb66..e7ba3b15024 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.10 2003/01/02 03:19:32 rh Exp $
+$NetBSD: distinfo,v 1.11 2003/01/09 09:47:30 rh Exp $
 
-SHA1 (gnome-vfs-1.0.3.tar.gz) = 51b4ca77591ee83b35d3987f0f26740623c1fa0a
-Size (gnome-vfs-1.0.3.tar.gz) = 1211129 bytes
-SHA1 (patch-aa) = d52f92046cb455587571b3eaa82efa4724c05328
+SHA1 (gnome-vfs-1.0.5.tar.gz) = 41156323969d44e3f14ce481b81bfdb5d1deba49
+Size (gnome-vfs-1.0.5.tar.gz) = 1048954 bytes
 SHA1 (patch-ab) = 6d038601f881185f8a4c55a604f7baccb8693ffe
 SHA1 (patch-ac) = 4da6d9b46d059710dcd8248dd9d23cb79e5253e1
-SHA1 (patch-ad) = cf959c7d8eb70dba844ea01e887e7487111d9cbd
 SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
 SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
-SHA1 (patch-ag) = 20260ccfc66aa977770a502b30f888c7039332a5
-SHA1 (patch-ah) = 60692c044ca131bd76e94c9a6d3bb71a481b0827
diff --git a/sysutils/gnome-vfs/patches/patch-aa b/sysutils/gnome-vfs/patches/patch-aa
deleted file mode 100644
index 98b716052e2..00000000000
--- a/sysutils/gnome-vfs/patches/patch-aa
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/03/24 19:59:38 rh Exp $
-
---- aclocal.m4.orig	Fri Oct 12 18:35:42 2001
-+++ aclocal.m4
-@@ -148,46 +148,37 @@
- dnl AC_SUBST itself to avoid automake putting 
- dnl XML_I18N_MERGE_OAF_RULE = @XML_I18N_MERGE_OAF_RULE@
- dnl in all the Makefile.in's, because that will blow up when substituted.
--XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -o -p $(top_srcdir)/po $< [$]*.oaf'
-+XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o -p $(top_srcdir)/po $< [$]*.oaf'
- HACK_SUBST(XML_I18N_MERGE_OAF_RULE)
- 
--XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -o -u $(top_srcdir)/po $< [$]*.server'
-+XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o -u $(top_srcdir)/po $< [$]*.server'
- HACK_SUBST(XML_I18N_MERGE_SERVER_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -k X18T_KEYS_KIND $(top_srcdir)/po $< [$]*.keys'
-+XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -k X18T_KEYS_KIND $(top_srcdir)/po $< [$]*.keys'
- HACK_SUBST(XML_I18N_MERGE_KEYS_RULE)
- dnl same deal
--XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.desktop'
-+XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.desktop'
- HACK_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.directory'
-+XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.directory'
- HACK_SUBST(XML_I18N_MERGE_DIRECTORY_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.soundlist'
-+XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.soundlist'
- HACK_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -x X18T_PFORG1 $(top_srcdir)/po $< [$]*.pong'
-+XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x X18T_PFORG1 $(top_srcdir)/po $< [$]*.pong'
- HACK_SUBST(XML_I18N_MERGE_PONG_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -x X18T_XML_KIND $(top_srcdir)/po $< [$]*.xml'
-+XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x X18T_XML_KIND $(top_srcdir)/po $< [$]*.xml'
- HACK_SUBST(XML_I18N_MERGE_XML_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_SHEET_RULE='\%.sheet : \%.sheet.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -x -u $(top_srcdir)/po $< [$]*.sheet'
-+XML_I18N_MERGE_SHEET_RULE='\%.sheet : \%.sheet.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x -u $(top_srcdir)/po $< [$]*.sheet'
- HACK_SUBST(XML_I18N_MERGE_SHEET_RULE)
- 
- 
-@@ -4447,7 +4438,7 @@
- 		  [CATOBJEXT=.gmo
- 		   DATADIRNAME=share],
- 		  [CATOBJEXT=.mo
--		   DATADIRNAME=lib])
-+		   DATADIRNAME=share])
- 		INSTOBJEXT=.mo
- 	      fi
- 	    fi
diff --git a/sysutils/gnome-vfs/patches/patch-ad b/sysutils/gnome-vfs/patches/patch-ad
deleted file mode 100644
index d88afdd49b5..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2000/11/30 03:45:26 mycroft Exp $
-
---- modules/Makefile.am.orig	Tue Oct 31 09:55:54 2000
-+++ modules/Makefile.am	Thu Nov 30 03:42:24 2000
-@@ -77,6 +77,7 @@
- 
- libvfs_test_la_SOURCES =			\
- 	test-method.c				
-+libvfs_test_la_LDFLAGS = $(module_flags)
- libvfs_test_la_LIBADD = $(XML_LIBS)
- 
- ### `gzip' method
-@@ -102,6 +103,7 @@
- libftp_la_SOURCES = 				\
- 	ftp-method.c				\
- 	ftp-method.h
-+libftp_la_LDFLAGS = $(module_flags)
- 
- ### `gconf' method
- 
diff --git a/sysutils/gnome-vfs/patches/patch-ag b/sysutils/gnome-vfs/patches/patch-ag
deleted file mode 100644
index 602c30cb0ba..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ag
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2002/08/28 16:49:39 jlam Exp $
-
---- configure.orig	Fri Oct 12 04:35:44 2001
-+++ configure
-@@ -10210,7 +10210,6 @@
- data/Makefile
- data/mime/Makefile
- idl/Makefile
--intl/Makefile
- libgnomevfs-pthread/Makefile
- libgnomevfs/Makefile
- modules/Makefile
-@@ -10230,7 +10229,9 @@
- test/Makefile
- test/vfs-run
- doc/Makefile
--macros/Makefile
-+xml-i18n-extract
-+xml-i18n-merge
-+xml-i18n-update
-  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
-@@ -10475,7 +10476,6 @@
- data/Makefile
- data/mime/Makefile
- idl/Makefile
--intl/Makefile
- libgnomevfs-pthread/Makefile
- libgnomevfs/Makefile
- modules/Makefile
-@@ -10495,7 +10495,9 @@
- test/Makefile
- test/vfs-run
- doc/Makefile
--macros/Makefile
-+xml-i18n-extract
-+xml-i18n-merge
-+xml-i18n-update
- "}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
diff --git a/sysutils/gnome-vfs/patches/patch-ah b/sysutils/gnome-vfs/patches/patch-ah
deleted file mode 100644
index 02e38fabd48..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/01/02 03:19:33 rh Exp $
-
---- Makefile.am.orig	Fri Oct 12 03:18:11 2001
-+++ Makefile.am
-@@ -9,8 +9,6 @@ SUBDIRS =					\
- 	libgnomevfs-pthread			\
- 	idl					\
- 	modules					\
--	data					\
--	man					\
- 	devel-docs				\
- 	$(SUBDIRS_GNOME)			\
- 	po