- Update to 2.15.3

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

8 files changed, 37 insertions, 38 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index cc0966711..9c6f41368 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.145 2006/06/14 16:30:53 marcus Exp $
+#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.146 2006/06/17 17:08:00 marcus Exp $
 #
 
 PORTNAME=	gnome-vfs
-PORTVERSION=	2.15.2
-PORTREVISION?=	2
+PORTVERSION=	2.15.3
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 8d1f98252..c2f706801 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.15.2.tar.bz2) = a2bfa7c76d77d777589995634051b293
-SHA256 (gnome2/gnome-vfs-2.15.2.tar.bz2) = 1ea0b96b96efc23a2700472de46fb91137c1773cf5d393034558c6237885ab4b
-SIZE (gnome2/gnome-vfs-2.15.2.tar.bz2) = 1820456
+MD5 (gnome2/gnome-vfs-2.15.3.tar.bz2) = f7eb8f2c658d6c8dfc34b5a2161e6890
+SHA256 (gnome2/gnome-vfs-2.15.3.tar.bz2) = 30fe94196a41565f66cf4f8a876dcb10f2ea3fcb1b0b2cb20f0863138ff3c5e8
+SIZE (gnome2/gnome-vfs-2.15.3.tar.bz2) = 1842761
diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in
index 8c0d2a131..7213df2fa 100644
--- a/devel/gnome-vfs/files/patch-Makefile.in
+++ b/devel/gnome-vfs/files/patch-Makefile.in
@@ -1,10 +1,10 @@
---- Makefile.in.orig	Tue Nov 30 02:05:26 2004
-+++ Makefile.in	Tue Nov 30 02:05:34 2004
-@@ -230,7 +230,6 @@
+--- Makefile.in.orig	Tue Jul 11 09:30:02 2006
++++ Makefile.in	Tue Jul 11 09:30:32 2006
+@@ -352,7 +352,6 @@
  	devel-docs				\
  	doc					\
  	programs				\
 -	test					\
- 	monikers				\
  	po
  
+ EXTRA_DIST = \
diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure
index 8835cb06b..1bef1ebac 100644
--- a/devel/gnome-vfs/files/patch-configure
+++ b/devel/gnome-vfs/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed May 17 11:33:28 2006
-+++ configure	Wed May 17 21:44:26 2006
-@@ -23540,6 +23540,8 @@
+--- configure.orig	Tue Jul 11 09:30:54 2006
++++ configure	Tue Jul 11 09:31:51 2006
+@@ -23202,6 +23202,8 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -9,7 +9,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23622,6 +23624,7 @@
+@@ -23283,6 +23285,7 @@
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
@@ -17,7 +17,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -23629,6 +23632,7 @@
+@@ -23290,6 +23293,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
@@ -25,7 +25,7 @@
   have_ngettext=yes
  else
    echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -25026,7 +25030,7 @@
+@@ -24669,7 +24673,7 @@
  
  
  
@@ -34,7 +34,7 @@
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -33396,7 +33400,7 @@
+@@ -32940,7 +32944,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -43,7 +43,7 @@
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33694,7 +33698,7 @@
+@@ -33236,7 +33240,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -52,7 +52,7 @@
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37536,6 +37540,9 @@
+@@ -38765,6 +38769,9 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -62,7 +62,7 @@
  #include <sys/statfs.h>
  #include <sys/fstyp.h>
  _ACEOF
-@@ -37577,6 +37584,9 @@
+@@ -38806,6 +38813,9 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -72,9 +72,9 @@
  #include <sys/statfs.h>
  #include <sys/vmount.h>
  _ACEOF
-@@ -39016,6 +39026,7 @@
- s,@ORBIT_IDL@,$ORBIT_IDL,;t t
- s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
+@@ -40026,6 +40036,7 @@
+ s,@TEST_CFLAGS@,$TEST_CFLAGS,;t t
+ s,@TEST_LIBS@,$TEST_LIBS,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
 +s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
index 088433c51..eb0f45920 100644
--- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
@@ -1,9 +1,9 @@
---- gnome-vfs-2.0.pc.in.orig	Wed Sep 14 05:30:25 2005
-+++ gnome-vfs-2.0.pc.in	Mon Oct  3 12:00:02 2005
+--- gnome-vfs-2.0.pc.in.orig	Tue Jul 11 07:31:58 2006
++++ gnome-vfs-2.0.pc.in	Tue Jul 11 09:33:47 2006
 @@ -8,5 +8,5 @@
  Description: The GNOME virtual file-system libraries
  Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
+ Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
 -Libs: -L${libdir} -lgnomevfs-2
 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
  Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
index c3f0d2c30..168fba882 100644
--- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
@@ -1,9 +1,9 @@
---- gnome-vfs-module-2.0.pc.in.orig	Wed Sep 14 05:30:25 2005
-+++ gnome-vfs-module-2.0.pc.in	Mon Oct  3 12:01:04 2005
+--- gnome-vfs-module-2.0.pc.in.orig	Tue Jul 11 07:31:58 2006
++++ gnome-vfs-module-2.0.pc.in	Tue Jul 11 09:34:36 2006
 @@ -8,5 +8,5 @@
  Description: The GNOME virtual file-system module include info
  Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
+ Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
 -Libs: -L${libdir} -lgnomevfs-2
 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
  Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnome-vfs/files/patch-modules_file-method-acl.c b/devel/gnome-vfs/files/patch-modules_file-method-acl.c
index d64f5f58d..9134fbb89 100644
--- a/devel/gnome-vfs/files/patch-modules_file-method-acl.c
+++ b/devel/gnome-vfs/files/patch-modules_file-method-acl.c
@@ -1,11 +1,11 @@
---- modules/file-method-acl.c.orig	Mon Jun 12 14:12:40 2006
-+++ modules/file-method-acl.c	Mon Jun 12 14:12:52 2006
+--- modules/file-method-acl.c.orig	Tue Jun 13 16:04:46 2006
++++ modules/file-method-acl.c	Tue Jul 11 09:36:57 2006
 @@ -45,7 +45,7 @@
  #endif
  
  #ifdef HAVE_POSIX_ACL
 -# include <acl/libacl.h>
 +# include <sys/acl.h>
+ #define HAVE_ACL
  #endif
  
- #ifdef HAVE_SOLARIS_ACL
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index fba2a0874..faaa665c6 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -28,6 +28,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
@@ -50,7 +51,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h
@@ -60,9 +60,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h
 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.a
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.la
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
 lib/gnome-vfs-2.0/modules/libbzip2.a
 lib/gnome-vfs-2.0/modules/libbzip2.la
 lib/gnome-vfs-2.0/modules/libbzip2.so
@@ -106,11 +103,10 @@ lib/libgnomevfs-2.a
 lib/libgnomevfs-2.la
 lib/libgnomevfs-2.so
 lib/libgnomevfs-2.so.0
-libdata/bonobo/servers/GNOME_VFS_Daemon.server
-libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
 libexec/gnome-vfs-daemon
+share/dbus-1/services/gnome-vfs-daemon.service
 share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -118,6 +114,7 @@ share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -200,3 +197,5 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN