diff --git a/x11/gnome/vfs/Makefile b/x11/gnome/vfs/Makefile index e2ae96b12f8..4fd0901c74f 100644 --- a/x11/gnome/vfs/Makefile +++ b/x11/gnome/vfs/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.18 2004/12/15 13:57:57 alek Exp $ +# $OpenBSD: Makefile,v 1.19 2005/01/02 09:23:11 sturm Exp $ COMMENT= "GNOME Virtual File System" DISTNAME= gnome-vfs-1.0.5 +PKGNAME= ${DISTNAME}p0 CATEGORIES= devel x11/gnome HOMEPAGE= http://www.gnome.org/ @@ -33,6 +34,9 @@ CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" LIBS="-pthread" +# writes to $HOME and other brokenness +NO_REGRESS= Yes + post-install: @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-vfs; \ cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gnome-vfs/ diff --git a/x11/gnome/vfs/patches/patch-modules_Makefile_in b/x11/gnome/vfs/patches/patch-modules_Makefile_in index 8658fb75160..9822e20a22f 100644 --- a/x11/gnome/vfs/patches/patch-modules_Makefile_in +++ b/x11/gnome/vfs/patches/patch-modules_Makefile_in @@ -1,7 +1,16 @@ -$OpenBSD: patch-modules_Makefile_in,v 1.3 2002/10/21 05:55:16 marcm Exp $ ---- modules/Makefile.in.orig Fri Mar 15 12:51:22 2002 -+++ modules/Makefile.in Tue Oct 15 17:11:27 2002 -@@ -199,7 +199,7 @@ EXTRA_DIST = default-modules.conf c +$OpenBSD: patch-modules_Makefile_in,v 1.4 2005/01/02 09:23:12 sturm Exp $ +--- modules/Makefile.in.orig Fri Mar 15 21:51:22 2002 ++++ modules/Makefile.in Sat Jan 1 17:39:32 2005 +@@ -189,7 +189,7 @@ cxxflags_set = @cxxflags_set@ + l = @l@ + + NULL = +-SUBDIRS = extfs ++SUBDIRS = + + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libgnomevfs -I$(top_builddir)/libgnomevfs -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GLIB_CFLAGS) $(XML_CFLAGS) $(LIBEFS_CFLAGS) $(GCONF_CFLAGS) $(VFS_GNOME_CFLAGS) $(VFS_CFLAGS) $(WERROR) -D_GNU_SOURCE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSYSCONFDIR=\"$(sysconfdir)\" -DPREFIX=\"$(prefix)\" -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + +@@ -199,10 +199,10 @@ EXTRA_DIST = default-modules.conf c @HAVE_CDDA_TRUE@CDDA_LTLIBS = libcdda.la @HAVE_CDDA_FALSE@CDDA_LTLIBS = @@ -9,4 +18,21 @@ $OpenBSD: patch-modules_Makefile_in,v 1.3 2002/10/21 05:55:16 marcm Exp $ +module_flags = -module -export_dynamic -avoid-version modulesdir = $(libdir)/vfs/modules - modules_LTLIBRARIES = $(CDDA_LTLIBS) libextfs.la libfile.la libvfs-test.la $(HTTP_LTLIBS) libbzip2.la libgzip.la libftp.la libnntp.la libvfs-pipe.la libvfs-translate.la libdesktop.la $(NULL) +-modules_LTLIBRARIES = $(CDDA_LTLIBS) libextfs.la libfile.la libvfs-test.la $(HTTP_LTLIBS) libbzip2.la libgzip.la libftp.la libnntp.la libvfs-pipe.la libvfs-translate.la libdesktop.la $(NULL) ++modules_LTLIBRARIES = $(CDDA_LTLIBS) libfile.la libvfs-test.la $(HTTP_LTLIBS) libbzip2.la libgzip.la libftp.la libnntp.la libvfs-pipe.la libvfs-translate.la libdesktop.la $(NULL) + + + # Disabled for now +@@ -221,12 +221,6 @@ libcdda_la_SOURCES = cdda-method.c + + libcdda_la_LDFLAGS = $(module_flags) + libcdda_la_LIBADD = -L/gnome/lib -lcdda_paranoia -lcdda_interface +- +-### `extfs' method +- +-libextfs_la_SOURCES = extfs-method.c extfs-method.h +- +-libextfs_la_LDFLAGS = $(module_flags) + + ### `file' method + diff --git a/x11/gnome/vfs/patches/patch-modules_default-modules_conf b/x11/gnome/vfs/patches/patch-modules_default-modules_conf new file mode 100644 index 00000000000..89de9977ef6 --- /dev/null +++ b/x11/gnome/vfs/patches/patch-modules_default-modules_conf @@ -0,0 +1,13 @@ +$OpenBSD: patch-modules_default-modules_conf,v 1.1 2005/01/02 09:23:12 sturm Exp $ +--- modules/default-modules.conf.orig Sat Jan 1 17:37:14 2005 ++++ modules/default-modules.conf Sat Jan 1 17:37:32 2005 +@@ -30,9 +30,6 @@ pipe: vfs-pipe + + ssh: ssh + +-# The various access methods implemented by the extfs system. +-a ar arj cpio deb hp48 lha mailfs patchfs rar rpm rpms trpm zip zoo: extfs +- + # and the desktop module + preferences: libdesktop.so + system-settings: libdesktop.so diff --git a/x11/gnome/vfs/pkg/PFRAG.shared b/x11/gnome/vfs/pkg/PFRAG.shared index 5beaa096766..362ea287176 100644 --- a/x11/gnome/vfs/pkg/PFRAG.shared +++ b/x11/gnome/vfs/pkg/PFRAG.shared @@ -1,9 +1,8 @@ -@comment $OpenBSD: PFRAG.shared,v 1.6 2004/10/11 04:27:25 marcm Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.7 2005/01/02 09:23:12 sturm Exp $ lib/libgnomevfs-pthread.so @lib lib/libgnomevfs.so.0.2 lib/vfs/modules/libbzip2.so lib/vfs/modules/libdesktop.so -lib/vfs/modules/libextfs.so lib/vfs/modules/libfile.so lib/vfs/modules/libftp.so lib/vfs/modules/libgzip.so diff --git a/x11/gnome/vfs/pkg/PLIST b/x11/gnome/vfs/pkg/PLIST index fdf3c1a836d..c5f5587086b 100644 --- a/x11/gnome/vfs/pkg/PLIST +++ b/x11/gnome/vfs/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.10 2004/10/11 04:27:25 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.11 2005/01/02 09:23:12 sturm Exp $ bin/gnome-vfs-config @comment doc/ include/gnome-vfs-1.0/ @@ -59,31 +59,11 @@ lib/libgnomevfs-pthread.la lib/libgnomevfs.a lib/libgnomevfs.la lib/vfs/ -lib/vfs/extfs/ -lib/vfs/extfs/README -lib/vfs/extfs/a -lib/vfs/extfs/ar -lib/vfs/extfs/arj -lib/vfs/extfs/cpio -lib/vfs/extfs/deb -lib/vfs/extfs/hp48 -lib/vfs/extfs/lha -lib/vfs/extfs/mailfs -lib/vfs/extfs/patchfs -lib/vfs/extfs/rar -lib/vfs/extfs/rpm -lib/vfs/extfs/rpms -lib/vfs/extfs/tar -lib/vfs/extfs/trpm -lib/vfs/extfs/zip -lib/vfs/extfs/zoo lib/vfs/modules/ lib/vfs/modules/libbzip2.a lib/vfs/modules/libbzip2.la lib/vfs/modules/libdesktop.a lib/vfs/modules/libdesktop.la -lib/vfs/modules/libextfs.a -lib/vfs/modules/libextfs.la lib/vfs/modules/libfile.a lib/vfs/modules/libfile.la lib/vfs/modules/libftp.a @@ -109,3 +89,6 @@ share/examples/gnome-vfs/vfs/modules/ share/examples/gnome-vfs/vfs/modules/default-modules.conf @sample ${SYSCONFDIR}/vfs/modules/default-modules.conf %%SHARED%% +@comment share/gtk-doc/ +@comment share/gtk-doc/html/ +@comment share/gtk-doc/html/gnome-vfs/