* Remove the extfs module and related binaries. They never really worked, and

  had numerous security problems
* Enable optional cdparanoia support

4 files changed, 54 insertions, 30 deletions

diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index dfcdc0cd801a..bbf7194e26d2 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomevfs
 PORTVERSION=	1.0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/1.0
@@ -34,6 +34,17 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
+.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
+WITH_CDPARANOIA=	yes
+.endif
+
+.if defined(WITH_CDPARANOIA)
+LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
+PLIST_SUB+=	CDPARANOIA=""
+.else
+PLIST_SUB+=	CDPARANOIA="@comment "
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name 'xml-i18n-*' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr/local/bin/perl|${PERL}|g'
diff --git a/devel/gnome-vfs1/files/patch-ac b/devel/gnome-vfs1/files/patch-ac
index 29014f5e1e52..53175ace8261 100644
--- a/devel/gnome-vfs1/files/patch-ac
+++ b/devel/gnome-vfs1/files/patch-ac
@@ -1,9 +1,15 @@
-
-$FreeBSD$
-
---- modules/Makefile.in.orig	Sun Mar 17 15:05:08 2002
-+++ modules/Makefile.in	Sun Mar 17 15:05:08 2002
-@@ -199,7 +199,7 @@
+--- modules/Makefile.in.orig	Thu Aug 26 21:10:36 2004
++++ modules/Makefile.in	Thu Aug 26 21:11:07 2004
+@@ -189,7 +189,7 @@
+ 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 @@
  @HAVE_CDDA_TRUE@CDDA_LTLIBS = libcdda.la
  @HAVE_CDDA_FALSE@CDDA_LTLIBS = 
  
@@ -11,12 +17,24 @@ $FreeBSD$
 +module_flags = -export_dynamic -avoid-version -module $(PTHREAD_LIB)
  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)
-@@ -217,7 +217,6 @@
- ###  `cdda' method
+-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
+@@ -218,15 +218,8 @@
  
  libcdda_la_SOURCES =  	cdda-method.c 					cdda-method.h					cdda-cddb.c 					cdda-cddb.h					cdda-cdrom-extensions.h
--
  
+-
  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/devel/gnome-vfs1/files/patch-modules_default-modules.conf b/devel/gnome-vfs1/files/patch-modules_default-modules.conf
new file mode 100644
index 000000000000..33830491e394
--- /dev/null
+++ b/devel/gnome-vfs1/files/patch-modules_default-modules.conf
@@ -0,0 +1,12 @@
+--- modules/default-modules.conf.orig	Thu Aug 26 21:11:40 2004
++++ modules/default-modules.conf	Thu Aug 26 21:11:47 2004
+@@ -30,9 +30,6 @@
+ 
+ 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/devel/gnome-vfs1/pkg-plist b/devel/gnome-vfs1/pkg-plist
index ec29ffe212d7..7c2b57abcc6c 100644
--- a/devel/gnome-vfs1/pkg-plist
+++ b/devel/gnome-vfs1/pkg-plist
@@ -1,4 +1,5 @@
 bin/gnome-vfs-config
+%%CDPARANOIA%%etc/vfs/modules/cdda-module.conf
 etc/vfs/modules/default-modules.conf
 etc/vfsConf.sh
 include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-application-registry.h
@@ -52,26 +53,9 @@ lib/libgnomevfs-pthread.so
 lib/libgnomevfs.a
 lib/libgnomevfs.so
 lib/libgnomevfs.so.0
-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/libbzip2.so
+%%CDPARANOIA%%lib/vfs/modules/libcdda.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
@@ -111,6 +95,5 @@ 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
-@dirrm lib/vfs/extfs
 @dirrm include/gnome-vfs-1.0/libgnomevfs
 @dirrm include/gnome-vfs-1.0