Update to 2.11.90, and disable cdparanoia support. The cdda module was

removed from the default distribution, and it is recommended not to include
it.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4319 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 22 insertions, 52 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 8cacf1681..9033b8335 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.99 2005/07/03 19:36:58 marcus Exp $
+#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.100 2005/07/11 21:20:18 marcus Exp $
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.11.4
+PORTVERSION=	2.11.90
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.11
@@ -44,18 +44,12 @@ GCONF_SCHEMAS=	desktop_default_applications.schemas \
 .include <bsd.port.pre.mk>
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-.undef WITHOUT_CDPARANOIA
 .undef WITHOUT_SAMBA
 .undef WITHOUT_MDNS
 WITH_MDNS=		yes
-WITH_CDPARANOIA=	yes
 WITH_SAMBA=		yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
-WITH_CDPARANOIA=	yes
-.endif
-
 .if exists(${LOCALBASE}/lib/libsmbclient.so)
 WITH_SAMBA=		yes
 .endif
@@ -64,13 +58,6 @@ WITH_SAMBA=		yes
 WITH_MDNS=		yes
 .endif
 
-.if defined(WITH_CDPARANOIA)
-LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
-PLIST_SUB+=	CDPARANOIA=""
-.else
-PLIST_SUB+=	CDPARANOIA="@comment "
-.endif
-
 .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
 USE_FAM=	yes
 .endif
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index a3a3e61e2..a351b506d 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.11.4.tar.bz2) = 8aad72f70a3aa2257b9d4afd5e53da65
-SIZE (gnome2/gnome-vfs-2.11.4.tar.bz2) = 1693583
+MD5 (gnome2/gnome-vfs-2.11.90.tar.bz2) = e6c55660c8190eb3c58c90c1a6988044
+SIZE (gnome2/gnome-vfs-2.11.90.tar.bz2) = 1933727
diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
index 9362cac17..6264f9930 100644
--- a/devel/gnome-vfs/files/patch-ac
+++ b/devel/gnome-vfs/files/patch-ac
@@ -1,11 +1,11 @@
---- modules/Makefile.in.orig	Tue May  6 15:39:48 2003
-+++ modules/Makefile.in	Tue May  6 15:41:28 2003
-@@ -210,7 +210,7 @@
- @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la
- @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
- 
+--- modules/Makefile.in.orig	Mon Jul 25 22:29:01 2005
++++ modules/Makefile.in	Mon Jul 25 22:29:45 2005
+@@ -466,7 +466,7 @@
+ @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la
+ @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la
+ @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = 
 -module_flags = -export_dynamic -avoid-version -module -no-undefined
 +module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB)
  modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
  modules_LTLIBRARIES = \
+ 	$(CDDA_LTLIBS)				\
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index f608cc8fa..205e0793c 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -6,7 +6,6 @@ bin/gnomevfs-mkdir
 bin/gnomevfs-monitor
 bin/gnomevfs-mv
 bin/gnomevfs-rm
-%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
 etc/gnome-vfs-2.0/modules/default-modules.conf
 %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
 etc/gnome-vfs-2.0/modules/ssl-modules.conf
@@ -59,7 +58,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
 lib/gnome-vfs-2.0/modules/libbzip2.so
-%%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so
 lib/gnome-vfs-2.0/modules/libcomputer.so
 lib/gnome-vfs-2.0/modules/libdns-sd.so
 lib/gnome-vfs-2.0/modules/libfile.so
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 8cacf1681..9033b8335 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.99 2005/07/03 19:36:58 marcus Exp $
+#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.100 2005/07/11 21:20:18 marcus Exp $
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.11.4
+PORTVERSION=	2.11.90
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.11
@@ -44,18 +44,12 @@ GCONF_SCHEMAS=	desktop_default_applications.schemas \
 .include <bsd.port.pre.mk>
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-.undef WITHOUT_CDPARANOIA
 .undef WITHOUT_SAMBA
 .undef WITHOUT_MDNS
 WITH_MDNS=		yes
-WITH_CDPARANOIA=	yes
 WITH_SAMBA=		yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
-WITH_CDPARANOIA=	yes
-.endif
-
 .if exists(${LOCALBASE}/lib/libsmbclient.so)
 WITH_SAMBA=		yes
 .endif
@@ -64,13 +58,6 @@ WITH_SAMBA=		yes
 WITH_MDNS=		yes
 .endif
 
-.if defined(WITH_CDPARANOIA)
-LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
-PLIST_SUB+=	CDPARANOIA=""
-.else
-PLIST_SUB+=	CDPARANOIA="@comment "
-.endif
-
 .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
 USE_FAM=	yes
 .endif
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index a3a3e61e2..a351b506d 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.11.4.tar.bz2) = 8aad72f70a3aa2257b9d4afd5e53da65
-SIZE (gnome2/gnome-vfs-2.11.4.tar.bz2) = 1693583
+MD5 (gnome2/gnome-vfs-2.11.90.tar.bz2) = e6c55660c8190eb3c58c90c1a6988044
+SIZE (gnome2/gnome-vfs-2.11.90.tar.bz2) = 1933727
diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac
index 9362cac17..6264f9930 100644
--- a/devel/gnomevfs2/files/patch-ac
+++ b/devel/gnomevfs2/files/patch-ac
@@ -1,11 +1,11 @@
---- modules/Makefile.in.orig	Tue May  6 15:39:48 2003
-+++ modules/Makefile.in	Tue May  6 15:41:28 2003
-@@ -210,7 +210,7 @@
- @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la
- @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
- 
+--- modules/Makefile.in.orig	Mon Jul 25 22:29:01 2005
++++ modules/Makefile.in	Mon Jul 25 22:29:45 2005
+@@ -466,7 +466,7 @@
+ @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la
+ @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la
+ @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = 
 -module_flags = -export_dynamic -avoid-version -module -no-undefined
 +module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB)
  modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
  modules_LTLIBRARIES = \
+ 	$(CDDA_LTLIBS)				\
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index f608cc8fa..205e0793c 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -6,7 +6,6 @@ bin/gnomevfs-mkdir
 bin/gnomevfs-monitor
 bin/gnomevfs-mv
 bin/gnomevfs-rm
-%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
 etc/gnome-vfs-2.0/modules/default-modules.conf
 %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
 etc/gnome-vfs-2.0/modules/ssl-modules.conf
@@ -59,7 +58,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
 lib/gnome-vfs-2.0/modules/libbzip2.so
-%%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so
 lib/gnome-vfs-2.0/modules/libcomputer.so
 lib/gnome-vfs-2.0/modules/libdns-sd.so
 lib/gnome-vfs-2.0/modules/libfile.so