Bump gnome-vfs2 to 2.0.4nb1:

	- Properly compile pluggable fs modules (pkg/18220)
	- Add missing dependencies (pkg/18220)
	- Make this more pkglint-friendly.
	- Don't try to tweak LTCONFIG_OVERRIDE towards ltmain.sh, use
	  LIBTOOL_OVERRIDE instead

14 files changed, 254 insertions, 9 deletions

diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index 1276251e283..55219cbede6 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/07 03:04:06 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/11 23:07:50 rh Exp $
 #
 
 DISTNAME=		gnome-vfs-2.0.4
-PKGNAME=		gnome-vfs2-2.0.4
+PKGNAME=		${DISTNAME:S/vfs/vfs2/}
+PKGREVISION=		1
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.1/sources/gnome-vfs/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +12,7 @@ MAINTAINER=		jmmv@hispabsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME Virtual File System (v2)
 
+BUILD_DEPENDS+=		gtk-doc-[0-9]*:../../textproc/gtk-doc
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
@@ -19,16 +21,23 @@ USE_GMAKE=		YES
 USE_GNU_GETTEXT=	YES
 
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltmain.sh
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-post-configure:
-	chmod +x ${WRKSRC}/ltmain.sh
-	( cd ${WRKSRC} && ./ltmain.sh )
+CONFIGURE_ARGS+=	--enable-platform-gnome-2
 
+.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../audio/cdparanoia/buildlink2.mk"
 .include "../../databases/gnome-mime-data/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf2/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
+.include "../../devel/bonobo-activation/buildlink2.mk"
 .include "../../devel/ptl2/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../net/ORBit2/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
 .include "../../sysutils/fam/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST
index 4f73ef9a396..3c2368ff3b9 100644
--- a/sysutils/gnome-vfs2/PLIST
+++ b/sysutils/gnome-vfs2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/07 03:04:06 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/11 23:07:50 rh Exp $
 etc/gnome-vfs-2.0/modules/default-modules.conf
 etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
 etc/gnome-vfs-2.0/vfolders/applications.vfolder-info-default
@@ -49,6 +49,45 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
 lib/bonobo/servers/GNOME_VFS_Moniker_std.server
 lib/gnome-vfs-2.0/include/gnome-vfs-file-size.h
+lib/gnome-vfs-2.0/modules/libbzip2.a
+lib/gnome-vfs-2.0/modules/libbzip2.la
+lib/gnome-vfs-2.0/modules/libbzip2.so
+lib/gnome-vfs-2.0/modules/libextfs.a
+lib/gnome-vfs-2.0/modules/libextfs.la
+lib/gnome-vfs-2.0/modules/libextfs.so
+lib/gnome-vfs-2.0/modules/libfile.a
+lib/gnome-vfs-2.0/modules/libfile.la
+lib/gnome-vfs-2.0/modules/libfile.so
+lib/gnome-vfs-2.0/modules/libftp.a
+lib/gnome-vfs-2.0/modules/libftp.la
+lib/gnome-vfs-2.0/modules/libftp.so
+lib/gnome-vfs-2.0/modules/libgzip.a
+lib/gnome-vfs-2.0/modules/libgzip.la
+lib/gnome-vfs-2.0/modules/libgzip.so
+lib/gnome-vfs-2.0/modules/libhttp.a
+lib/gnome-vfs-2.0/modules/libhttp.la
+lib/gnome-vfs-2.0/modules/libhttp.so
+lib/gnome-vfs-2.0/modules/libnntp.a
+lib/gnome-vfs-2.0/modules/libnntp.la
+lib/gnome-vfs-2.0/modules/libnntp.so
+lib/gnome-vfs-2.0/modules/libssh.a
+lib/gnome-vfs-2.0/modules/libssh.la
+lib/gnome-vfs-2.0/modules/libssh.so
+lib/gnome-vfs-2.0/modules/libtar.a
+lib/gnome-vfs-2.0/modules/libtar.la
+lib/gnome-vfs-2.0/modules/libtar.so
+lib/gnome-vfs-2.0/modules/libvfolder-desktop.a
+lib/gnome-vfs-2.0/modules/libvfolder-desktop.la
+lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
+lib/gnome-vfs-2.0/modules/libvfs-pipe.a
+lib/gnome-vfs-2.0/modules/libvfs-pipe.la
+lib/gnome-vfs-2.0/modules/libvfs-pipe.so
+lib/gnome-vfs-2.0/modules/libvfs-test.a
+lib/gnome-vfs-2.0/modules/libvfs-test.la
+lib/gnome-vfs-2.0/modules/libvfs-test.so
+lib/gnome-vfs-2.0/modules/libvfs-translate.a
+lib/gnome-vfs-2.0/modules/libvfs-translate.la
+lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.la
 lib/libgnomevfs-2.so
diff --git a/sysutils/gnome-vfs2/buildlink2.mk b/sysutils/gnome-vfs2/buildlink2.mk
index 43006a43543..d6a3f020946 100644
--- a/sysutils/gnome-vfs2/buildlink2.mk
+++ b/sysutils/gnome-vfs2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/07 03:04:06 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2002/09/11 23:07:50 rh Exp $
 
 .if !defined(GNOME_VFS2_BUILDLINK2_MK)
 GNOME_VFS2_BUILDLINK2_MK=	# defined
@@ -12,15 +12,25 @@ BUILDLINK_PREFIX.gnome-vfs2_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.gnome-vfs2=	include/gnome-vfs-2.0/libgnomevfs/*
 BUILDLINK_FILES.gnome-vfs2+=	include/gnome-vfs-module-2.0/libgnomevfs/*
 BUILDLINK_FILES.gnome-vfs2+=	lib/gnome-vfs-2.0/include/gnome-vfs-file-size.h
+BUILDLINK_FILES.gnome-vfs2+=	lib/gnome-vfs-2.0/modules/*
 BUILDLINK_FILES.gnome-vfs2+=	lib/libgnomevfs-2.*
 BUILDLINK_FILES.gnome-vfs2+=	lib/pkgconfig/gnome-vfs-2.0.pc
 BUILDLINK_FILES.gnome-vfs2+=	lib/pkgconfig/gnome-vfs-module-2.0.pc
 
+.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../audio/cdparanoia/buildlink2.mk"
 .include "../../databases/gnome-mime-data/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf2/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
+.include "../../devel/bonobo-activation/buildlink2.mk"
 .include "../../devel/ptl2/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../net/ORBit2/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
 .include "../../sysutils/fam/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gnome-vfs2-buildlink
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index 01e51f90f94..d5897384af3 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,7 +1,17 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/07 03:04:06 rh Exp $
+$NetBSD: distinfo,v 1.2 2002/09/11 23:07:50 rh Exp $
 
 SHA1 (gnome-vfs-2.0.4.tar.bz2) = 50c103fda5789cdc1f8af42f2fd4e15c266d0ecd
 Size (gnome-vfs-2.0.4.tar.bz2) = 892634 bytes
 SHA1 (patch-aa) = 7b55f951a970c40e1eb3cf14fabe391e096f7a80
 SHA1 (patch-ab) = d3790bd41ed17bb8afbdd424ded9e240d2108598
 SHA1 (patch-ac) = 3ca82545745654a85307bdbc4611a820145bb064
+SHA1 (patch-ad) = 674e29f933c284fdd33766690b1f45fc32a3d9d9
+SHA1 (patch-ae) = fbe0fa8e2def2fec2cc55317a35638d8314287d2
+SHA1 (patch-af) = a41b6590adc94caae8c3b1369f0e5d0882fab133
+SHA1 (patch-ag) = d69b0a70b067b82136867ca5afd0fa8ef72df145
+SHA1 (patch-ah) = 7912dafc386c41aa3e220b1e0e4073564406962b
+SHA1 (patch-ai) = 78cdf8b8f690a40d247b68fa72558f834d604144
+SHA1 (patch-aj) = 6d53906571c7b638ec71282666dc4935bd9e4477
+SHA1 (patch-ak) = a10d9993e67615e06b4dc056854ef2e07f045dc2
+SHA1 (patch-al) = 2e90dfb8eb2eeb900558a578f9e774fc5990d505
+SHA1 (patch-am) = 7d45e36fc701e07d7380b4d6880ecac79779f868
diff --git a/sysutils/gnome-vfs2/patches/patch-ad b/sysutils/gnome-vfs2/patches/patch-ad
new file mode 100644
index 00000000000..c91fa887c42
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2002/09/11 23:07:51 rh Exp $
+
+--- Makefile.am.orig	Sat Sep  7 17:53:13 2002
++++ Makefile.am	Sat Sep  7 17:53:08 2002
+@@ -6,7 +6,6 @@
+ 	schemas					\
+ 	devel-docs				\
+ 	doc					\
+-	test					\
+ 	monikers				\
+ 	po
+ 
diff --git a/sysutils/gnome-vfs2/patches/patch-ae b/sysutils/gnome-vfs2/patches/patch-ae
new file mode 100644
index 00000000000..3cb8869b18b
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2002/09/11 23:07:51 rh Exp $
+
+--- Makefile.in.orig	Sat Sep  7 17:52:45 2002
++++ Makefile.in	Sat Sep  7 17:53:24 2002
+@@ -183,7 +183,6 @@
+ 	schemas					\
+ 	devel-docs				\
+ 	doc					\
+-	test					\
+ 	monikers				\
+ 	po
+ 
diff --git a/sysutils/gnome-vfs2/patches/patch-af b/sysutils/gnome-vfs2/patches/patch-af
new file mode 100644
index 00000000000..0fb321358ca
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2002/09/11 23:07:51 rh Exp $
+
+--- modules/Makefile.am.orig	Sat Sep  7 18:19:01 2002
++++ modules/Makefile.am	Sat Sep  7 18:20:15 2002
+@@ -40,7 +40,7 @@
+ CDEMENU_LTLIBS =
+ endif
+ 
+-module_flags = -export_dynamic -avoid-version -module
++module_flags = -export_dynamic -avoid-version -module -L../libgnomevfs/.libs
+ modulesdir = $(libdir)/gnome-vfs-2.0/modules
+ 
+ modules_LTLIBRARIES =				\
diff --git a/sysutils/gnome-vfs2/patches/patch-ag b/sysutils/gnome-vfs2/patches/patch-ag
new file mode 100644
index 00000000000..acc761955f7
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2002/09/11 23:07:51 rh Exp $
+
+--- modules/Makefile.in.orig	Sat Sep  7 18:20:24 2002
++++ modules/Makefile.in	Sat Sep  7 18:24:03 2002
+@@ -213,7 +213,7 @@
+ @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la
+ @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
+ 
+-module_flags = -export_dynamic -avoid-version -module
++module_flags = -export_dynamic -avoid-version -module -L../libgnomevfs/.libs
+ modulesdir = $(libdir)/gnome-vfs-2.0/modules
+ 
+ modules_LTLIBRARIES = \
diff --git a/sysutils/gnome-vfs2/patches/patch-ah b/sysutils/gnome-vfs2/patches/patch-ah
new file mode 100644
index 00000000000..56632f325ed
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2002/09/11 23:07:52 rh Exp $
+
+--- modules/vfolder/Makefile.am.orig	Sat Sep  7 18:20:46 2002
++++ modules/vfolder/Makefile.am	Sat Sep  7 18:21:24 2002
+@@ -36,7 +36,7 @@
+ 
+ ###  Module setup
+ 
+-module_flags = -export_dynamic -avoid-version
++module_flags = -export_dynamic -avoid-version -L$(top_builddir)/libgnomevfs/.libs
+ modulesdir = $(libdir)/gnome-vfs-2.0/modules
+ 
+ modules_LTLIBRARIES = libvfolder-desktop.la
diff --git a/sysutils/gnome-vfs2/patches/patch-ai b/sysutils/gnome-vfs2/patches/patch-ai
new file mode 100644
index 00000000000..70b401762b3
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2002/09/11 23:07:52 rh Exp $
+
+--- modules/vfolder/Makefile.in.orig	Sat Sep  7 18:20:48 2002
++++ modules/vfolder/Makefile.in	Sat Sep  7 18:24:03 2002
+@@ -215,7 +215,7 @@
+ 
+ 
+ ###  Module setup
+-module_flags = -export_dynamic -avoid-version
++module_flags = -export_dynamic -avoid-version -L$(top_builddir)/libgnomevfs/.libs
+ modulesdir = $(libdir)/gnome-vfs-2.0/modules
+ 
+ modules_LTLIBRARIES = libvfolder-desktop.la
diff --git a/sysutils/gnome-vfs2/patches/patch-aj b/sysutils/gnome-vfs2/patches/patch-aj
new file mode 100644
index 00000000000..e503b82fb75
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2002/09/11 23:07:52 rh Exp $
+
+--- configure.in.orig	Mon Sep  9 12:25:15 2002
++++ configure.in	Mon Sep  9 12:25:30 2002
+@@ -85,7 +85,7 @@
+ AM_GLIB_GNU_GETTEXT
+ 
+ AC_FUNC_ALLOCA
+-AC_CHECK_FUNCS(getdtablesize open64 lseek64 statvfs)
++AC_CHECK_FUNCS(getdtablesize open64 lseek64 statvfs readdir_r)
+ AC_REPLACE_FUNCS(getdelim)
+ 
+ dnl Specify the gconf configuration source, 
diff --git a/sysutils/gnome-vfs2/patches/patch-ak b/sysutils/gnome-vfs2/patches/patch-ak
new file mode 100644
index 00000000000..19583d06bb5
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2002/09/11 23:07:52 rh Exp $
+
+--- config.h.in.orig	Mon Sep  9 12:25:36 2002
++++ config.h.in	Mon Sep  9 12:26:02 2002
+@@ -157,6 +157,9 @@
+ /* Define to 1 if you have the `statvfs' function. */
+ #undef HAVE_STATVFS
+ 
++/* Define to 1 if you have the `readdir_r' function. */
++#undef HAVE_READDIR_R
++
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #undef HAVE_STDINT_H
+ 
diff --git a/sysutils/gnome-vfs2/patches/patch-al b/sysutils/gnome-vfs2/patches/patch-al
new file mode 100644
index 00000000000..138729249b8
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-al
@@ -0,0 +1,61 @@
+$NetBSD: patch-al,v 1.1 2002/09/11 23:07:52 rh Exp $
+
+--- modules/file-method.c.orig	Mon Sep  9 12:29:10 2002
++++ modules/file-method.c	Mon Sep  9 12:33:33 2002
+@@ -511,8 +511,10 @@
+ 	result->uri = gnome_vfs_uri_ref (uri);
+ 	result->dir = dir;
+ 
++#ifdef HAVE_READDIR_R
+ 	/* Reserve extra space for readdir_r, see man page */
+ 	result->current_entry = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1);
++#endif
+ 
+ 	full_name = get_path_from_uri (uri);
+ 	g_assert (full_name != NULL); /* already done by caller */
+@@ -538,7 +540,9 @@
+ {
+ 	gnome_vfs_uri_unref (directory_handle->uri);
+ 	g_free (directory_handle->name_buffer);
++#ifdef HAVE_READDIR_R
+ 	g_free (directory_handle->current_entry);
++#endif
+ 	g_free (directory_handle);
+ }
+ 
+@@ -763,7 +767,11 @@
+ 	handle = (DirectoryHandle *) method_handle;
+ 	
+ 	errno = 0;
++#ifdef HAVE_READDIR_R
+ 	if (readdir_r (handle->dir, handle->current_entry, &result) != 0) {
++#else
++	if ((handle->current_entry = readdir (handle->dir)) == NULL) {
++#endif
+ 		/* Work around a Solaris bug.
+ 		 * readdir64_r returns -1 instead of 0 at EOF.
+ 		 */
+@@ -773,9 +781,11 @@
+ 		return gnome_vfs_result_from_errno ();
+ 	}
+ 	
++#ifdef HAVE_READDIR_R
+ 	if (result == NULL) {
+ 		return GNOME_VFS_ERROR_EOF;
+ 	}
++#endif
+ 
+ 	file_info->name = g_strdup (result->d_name);
+ 
+@@ -1068,7 +1078,11 @@
+ 
+ 	item_buffer = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1);
+ 	for (;;) {
++#ifdef HAVE_READDIR_R
+ 		if (readdir_r (directory, item_buffer, &item) != 0 || item == NULL) {
++#else
++		if ((item_buffer = readdir (directory)) == NULL) {
++#endif
+ 			break;
+ 		}
+ 
diff --git a/sysutils/gnome-vfs2/patches/patch-am b/sysutils/gnome-vfs2/patches/patch-am
new file mode 100644
index 00000000000..55cfc64768d
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2002/09/11 23:07:53 rh Exp $
+
+--- configure.orig	Tue Sep 10 16:52:04 2002
++++ configure	Tue Sep 10 16:52:47 2002
+@@ -12159,7 +12159,7 @@
+ 
+ 
+ 
+-for ac_func in getdtablesize open64 lseek64 statvfs
++for ac_func in getdtablesize open64 lseek64 statvfs readdir_r
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5