4 files changed, 25 insertions, 31 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index a702da9bc56c..1312fc788f55 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnome-vfs
-PORTVERSION=	2.16.1
+PORTVERSION=	2.16.2
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -39,8 +39,7 @@ CONFIGURE_ARGS=	--enable-openssl \
 		--enable-hal \
 		--with-hal-mount=/sbin/mount \
 		--with-hal-umount=/sbin/umount
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include -DPTHREAD_LIB=\"${PTHREAD_LIBS}\""
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PKGINSTALL=	${WRKDIR}/pkg-install
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 6552ad8718cd..572be0dfe97f 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.16.1.tar.bz2) = 2d9f7b01496ecc227015bc7a08fb798f
-SHA256 (gnome2/gnome-vfs-2.16.1.tar.bz2) = 8e6aaa1fb1fcf682484b27bbdf4335234752868ef3bc84ea1102a6ebf0d89067
-SIZE (gnome2/gnome-vfs-2.16.1.tar.bz2) = 1893290
+MD5 (gnome2/gnome-vfs-2.16.2.tar.bz2) = 1ad3988f374012f233973188ce518ae8
+SHA256 (gnome2/gnome-vfs-2.16.2.tar.bz2) = 5ba60ec5172368674bcb1993995c498925e3cd9a409d07d0aaf9623def55a947
+SIZE (gnome2/gnome-vfs-2.16.2.tar.bz2) = 1852172
diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure
index 1bef1ebaca77..80d1e5a7a367 100644
--- a/devel/gnome-vfs/files/patch-configure
+++ b/devel/gnome-vfs/files/patch-configure
@@ -1,7 +1,7 @@
---- 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
+--- configure.orig	Tue Nov  7 11:24:24 2006
++++ configure	Tue Nov  7 11:24:24 2006
+@@ -23193,6 +23193,8 @@
+ if test "${am_cv_val_LC_MESSAGES+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 +  ac_check_lib_save_LIBS=$LIBS
@@ -9,23 +9,23 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23283,6 +23285,7 @@
- fi
- rm -f conftest.err conftest.$ac_objext \
+@@ -23252,6 +23254,7 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
  fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -23290,6 +23293,7 @@
+ { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+ echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
+@@ -24873,6 +24876,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
 + LIBS="-lintl $LIBS"
   have_ngettext=yes
  else
-   echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -24669,7 +24673,7 @@
+   { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+@@ -26342,7 +26346,7 @@
  
  
  
@@ -33,8 +33,8 @@
 +for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h sys/sysmacros.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -32940,7 +32944,7 @@
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -36206,7 +36210,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -43,7 +43,7 @@
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33236,7 +33240,7 @@
+@@ -36531,7 +36535,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -52,7 +52,7 @@
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38765,6 +38769,9 @@
+@@ -42634,6 +42638,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
-@@ -38806,6 +38813,9 @@
+@@ -42681,6 +42688,9 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -72,11 +72,3 @@
  #include <sys/statfs.h>
  #include <sys/vmount.h>
  _ACEOF
-@@ -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
- s,@USE_NLS@,$USE_NLS,;t t
- s,@MSGFMT@,$MSGFMT,;t t
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 1e606b847900..6e36ede178f5 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -148,6 +148,7 @@ share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -228,6 +229,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/li/LC_MESSAGES
 @dirrmtry share/locale/li
 @dirrmtry share/locale/ko/LC_MESSAGES