From 2d33c2262d3ff76fabfe806c966f914b71e9a67b Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Fri, 3 Nov 2000 17:51:47 +0000 Subject: Update to 0.4 --- devel/gnome-vfs1/Makefile | 3 +-- devel/gnome-vfs1/distinfo | 2 +- devel/gnome-vfs1/files/patch-aa | 39 +++++++-------------------------------- devel/gnome-vfs1/files/patch-ab | 18 ++++++------------ devel/gnome-vfs1/files/patch-ac | 35 ++++++++++++----------------------- devel/gnome-vfs1/files/patch-ae | 12 ++++-------- devel/gnome-vfs1/pkg-plist | 11 ++++++++--- 7 files changed, 39 insertions(+), 81 deletions(-) (limited to 'devel/gnome-vfs1') diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index d69eea9c0a44..2393289adbed 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomevfs -PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTVERSION= 0.4 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gnome-vfs diff --git a/devel/gnome-vfs1/distinfo b/devel/gnome-vfs1/distinfo index 7329d0daa388..3f601c5f87ec 100644 --- a/devel/gnome-vfs1/distinfo +++ b/devel/gnome-vfs1/distinfo @@ -1 +1 @@ -MD5 (gnome-vfs-0.3.1.tar.gz) = af062ba135bb9582f1b2fb2feb7cb1a3 +MD5 (gnome-vfs-0.4.tar.gz) = 16f5a3ccd819ba6ea572ff94110fd395 diff --git a/devel/gnome-vfs1/files/patch-aa b/devel/gnome-vfs1/files/patch-aa index 1c45a532c432..98bb9e5f2b8d 100644 --- a/devel/gnome-vfs1/files/patch-aa +++ b/devel/gnome-vfs1/files/patch-aa @@ -1,32 +1,7 @@ ---- configure.orig Mon Jul 3 19:03:42 2000 -+++ configure Wed Jul 5 14:42:17 2000 -@@ -2204,7 +2204,7 @@ - # Check whether --enable-gconf or --disable-gconf was given. - if test "${enable_gconf+set}" = set; then - enableval="$enable_gconf" -- gconf_enabled="yes" -+ gconf_enabled="$enableval" - fi - - # Check whether --enable-libefs or --disable-libefs was given. -@@ -5924,7 +5924,7 @@ - VFSPTHREAD_LIBDIR='-L${libdir}' - VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include' - VFSPTHREAD_INCLUDEDIR="$VFSPTHREAD_INCLUDEDIR `gnome-config --cflags gnome`" --VFSPTHREAD_LIBS="-lgnomevfs -lgnomevfs-pthread `gnome-config --libs gnome` `glib-config --libs gthread`" -+VFSPTHREAD_LIBS="-lgnomevfs -lgnomevfs-pthread `gnome-config --libs gnome` `$GLIB_CONFIG --libs gthread`" - - - -@@ -5937,9 +5937,9 @@ - EOF - - --VFS_LIBS="-lgnomevfs `glib-config --libs gthread gmodule`" -+VFS_LIBS="-lgnomevfs `$GLIB_CONFIG --libs gthread gmodule`" - VFS_LIBDIR='-L${libdir}' --VFS_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'" `glib-config --cflags gthread gmodule`" -+VFS_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'" `$GLIB_CONFIG --cflags gthread gmodule`" - - - +--- configure.orig Thu Nov 2 17:44:34 2000 ++++ configure Fri Nov 3 10:22:49 2000 +@@ -2196,3 +2196,3 @@ + VFS_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`" +- VFS_GLIB_CONFIG="glib-config" ++ VFS_GLIB_CONFIG="$GLIB_CONFIG" + else diff --git a/devel/gnome-vfs1/files/patch-ab b/devel/gnome-vfs1/files/patch-ab index 5163e15edf51..2f95b5e5577f 100644 --- a/devel/gnome-vfs1/files/patch-ab +++ b/devel/gnome-vfs1/files/patch-ab @@ -1,18 +1,12 @@ ---- Makefile.in.orig Mon Jul 3 19:33:07 2000 -+++ Makefile.in Wed Jul 5 15:43:12 2000 -@@ -162,13 +162,13 @@ - @HAVE_GCONF_TRUE@SUBDIRS_GCONF = mime-type-capplet - @HAVE_GCONF_FALSE@SUBDIRS_GCONF = +--- Makefile.in.orig Thu Nov 2 17:45:38 2000 ++++ Makefile.in Fri Nov 3 10:24:16 2000 +@@ -171,3 +171,3 @@ --SUBDIRS = libgnomevfs libgnomevfs-pthread $(SUBDIRS_OAF) idl modules data man devel-docs $(SUBDIRS_GCONF) test po -+SUBDIRS = libgnomevfs libgnomevfs-pthread $(SUBDIRS_OAF) idl modules data man $(SUBDIRS_GCONF) test po - - - EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec vfsConf.sh.in vfscorbaConf.sh.in vfspthreadConf.sh.in +-SUBDIRS = libgnomevfs libgnomevfs-pthread $(SUBDIRS_OAF) idl modules data man devel-docs $(SUBDIRS_GNOME) po ++SUBDIRS = libgnomevfs libgnomevfs-pthread $(SUBDIRS_OAF) idl modules data man $(SUBDIRS_GNOME) po +@@ -179,3 +179,3 @@ -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = vfsConf.sh vfscorbaConf.sh vfspthreadConf.sh - - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/devel/gnome-vfs1/files/patch-ac b/devel/gnome-vfs1/files/patch-ac index dfe39cf495c7..01106d4b9978 100644 --- a/devel/gnome-vfs1/files/patch-ac +++ b/devel/gnome-vfs1/files/patch-ac @@ -1,26 +1,15 @@ ---- modules/Makefile.in.orig Wed Aug 2 13:39:35 2000 -+++ modules/Makefile.in Wed Aug 2 13:48:21 2000 -@@ -191,6 +191,7 @@ - - libfile_la_SOURCES = file-method.c file-method.h - -+libftp_la_LDFLAGS = $(module_flags) - - libfile_la_LDFLAGS = $(module_flags) - -@@ -266,14 +267,13 @@ - libbzip2_la_OBJECTS = bzip2-method.lo - libgzip_la_DEPENDENCIES = +--- modules/Makefile.in.orig Thu Nov 2 17:45:41 2000 ++++ modules/Makefile.in Fri Nov 3 10:52:23 2000 +@@ -235,2 +235,3 @@ + ++libftp_la_LDFLAGS = $(module_flags) + +@@ -283,3 +284,3 @@ + libfile_la_OBJECTS = file-method.lo +-libvfs_test_la_LDFLAGS = ++libvfs_test_la_LDFLAGS = $(module_flags) + libvfs_test_la_DEPENDENCIES = +@@ -292,3 +293,2 @@ libgzip_la_OBJECTS = gzip-method.lo -libftp_la_LDFLAGS = libftp_la_LIBADD = - libftp_la_OBJECTS = ftp-method.lo - libvfs_pipe_la_DEPENDENCIES = - libvfs_pipe_la_OBJECTS = pipe-method.lo - libvfs_translate_la_DEPENDENCIES = - libvfs_translate_la_OBJECTS = translate-method.lo --libvefs_la_LDFLAGS = -+libvefs_la_LDFLAGS = $(module_flags) - @HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES = - @HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS = efs-method.lo - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/gnome-vfs1/files/patch-ae b/devel/gnome-vfs1/files/patch-ae index 1d40bcf58511..736b9b64d1cb 100644 --- a/devel/gnome-vfs1/files/patch-ae +++ b/devel/gnome-vfs1/files/patch-ae @@ -1,14 +1,10 @@ ---- mime-type-capplet/nautilus-mime-type-capplet.c.orig Wed Aug 2 17:10:17 2000 -+++ mime-type-capplet/nautilus-mime-type-capplet.c Sat Aug 12 15:17:24 2000 -@@ -29,7 +29,11 @@ - #include - #include - #include +--- mime-type-capplet/nautilus-mime-type-capplet.c.orig Thu Nov 2 02:37:45 2000 ++++ mime-type-capplet/nautilus-mime-type-capplet.c Fri Nov 3 10:27:38 2000 +@@ -32,3 +32,7 @@ + #include +#ifdef __FreeBSD__ +#include +#else #include +#endif #include - #include - diff --git a/devel/gnome-vfs1/pkg-plist b/devel/gnome-vfs1/pkg-plist index bd78d27b675a..4eccdda7d73e 100644 --- a/devel/gnome-vfs1/pkg-plist +++ b/devel/gnome-vfs1/pkg-plist @@ -1,12 +1,13 @@ +bin/gnome-vfs-config bin/gnome-vfs-gen-mimedb bin/gnome-vfs-slave bin/nautilus-mime-type-capplet etc/gnome-vfs-mime-magic -etc/gnome-vfs-mime-magic.dat etc/vfs/modules/default-modules.conf etc/vfsConf.sh etc/vfscorbaConf.sh etc/vfspthreadConf.sh +include/libgnomevfs/gnome-vfs-application-registry.h include/libgnomevfs/gnome-vfs-async-ops.h include/libgnomevfs/gnome-vfs-backend.h include/libgnomevfs/gnome-vfs-cancellable-ops.h @@ -84,19 +85,22 @@ lib/vfs/modules/libftp.so lib/vfs/modules/libgconf.so lib/vfs/modules/libgzip.so lib/vfs/modules/libhttp.so -lib/vfs/modules/libvefs.so +lib/vfs/modules/libnfs.so lib/vfs/modules/libvfs-pipe.so +lib/vfs/modules/libvfs-test.so lib/vfs/modules/libvfs-translate.so +share/gnome/application-registry/gnome-vfs.applications share/gnome/apps/Settings/nautilus-mime-type.desktop share/gnome/control-center/nautilus-mime-type.desktop -share/gnome/mime-info/application-registry-hack.keys share/gnome/mime-info/gnome-vfs.keys share/gnome/mime-info/gnome-vfs.mime 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/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 @@ -112,6 +116,7 @@ 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 +@dirrm share/gnome/application-registry @dirrm lib/vfs/modules @dirrm lib/vfs/include @dirrm lib/vfs/extfs -- cgit v1.2.3