Update to 1.0.5.

PR:		35971
Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>

9 files changed, 104 insertions, 60 deletions

diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index 42e5afd76137..2cfcee55e1b6 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -6,36 +6,37 @@
 #
 
 PORTNAME=	gnomevfs
-PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTVERSION=	1.0.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-vfs
 DISTNAME=	gnome-vfs-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt-new:${PORTSDIR}/devel/gettext \
 		${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
-LIB_DEPENDS=	gconf-1.1:${PORTSDIR}/devel/gconf
+LIB_DEPENDS=	gconf-1.1:${PORTSDIR}/devel/gconf \
+		iconv.3:${PORTSDIR}/converters/libiconv
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOMELIBS=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
 		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
 		XGETTEXT=${LOCALBASE}/bin/xgettext-new \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
-MAN5=		gnome-vfs-mime.5
-
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/devel/gnomevfs/distinfo b/devel/gnomevfs/distinfo
index 7969fdefa4d4..8349ea3375cb 100644
--- a/devel/gnomevfs/distinfo
+++ b/devel/gnomevfs/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-1.0.4.tar.gz) = d3dd15715da9671813805674cafa0dc8
+MD5 (gnome/gnome-vfs-1.0.5.tar.bz2) = e2a17a6b178f54c43968241258f3e729
diff --git a/devel/gnomevfs/files/patch-aa b/devel/gnomevfs/files/patch-aa
index 430f97e1c0d7..858c3c9d85ec 100644
--- a/devel/gnomevfs/files/patch-aa
+++ b/devel/gnomevfs/files/patch-aa
@@ -1,29 +1,29 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Jan 24 10:25:14 2002
-+++ configure	Thu Jan 24 10:38:00 2002
-@@ -5949,7 +5949,7 @@
+--- configure.orig	Sun Mar 17 15:24:47 2002
++++ configure	Sun Mar 17 15:25:13 2002
+@@ -5953,7 +5953,7 @@
+ VFS_GNOME_LIBS="`gnome-config --libs gnome`"
  VFS_GNOMEUI_LIBS="`gnome-config --libs gnome gnomeui`"
  VFS_GNOMEGNORBA_LIBS="`gnome-config --libs gnome gnomeui gnorba`"
- VFS_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`"
 -VFS_GLIB_CONFIG="glib-config"
 +VFS_GLIB_CONFIG="$GLIB_CONFIG"
  
  
  
-@@ -9854,8 +9854,8 @@
+@@ -9856,8 +9856,8 @@
    done
  fi
  
 -echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
--echo "configure:9859: checking for bzCompressInit in -lbz2" >&5
+-echo "configure:9861: checking for bzCompressInit in -lbz2" >&5
 +echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
-+echo "configure:9859: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "configure:9861: checking for BZ2_bzCompressInit in -lbz2" >&5
  ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9868,10 +9868,10 @@
+@@ -9870,10 +9870,10 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
      builtin and then its argument prototype would still apply.  */
@@ -35,17 +35,17 @@ $FreeBSD$
 +BZ2_bzCompressInit()
  ; return 0; }
  EOF
- if { (eval echo configure:9878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -10101,7 +10101,7 @@
+ if { (eval echo configure:9880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -10103,7 +10103,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo"
  		cat > conftest.$ac_ext <<EOF
- #line 10107 "configure"
+ #line 10109 "configure"
  #include "confdefs.h"
-@@ -10135,7 +10135,7 @@
+@@ -10137,7 +10137,7 @@
  EOF
  
  		msg_openssl="yes"
@@ -54,7 +54,34 @@ $FreeBSD$
  		
  
  if true; then
-@@ -10594,7 +10594,7 @@
+@@ -10559,14 +10559,14 @@
+    #
+    # Check for libiconv
+    #
+-   echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
+-echo "configure:10564: checking for libiconv_open in -liconv" >&5
++   echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
++echo "configure:10564: checking for libiconv_open in -lgiconv" >&5
+ ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-liconv  $LIBS"
++LIBS="-lgiconv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 10572 "configure"
+ #include "confdefs.h"
+@@ -10606,7 +10606,7 @@
+ fi
+ 
+ if test "x$with_libiconv" = "xyes" ; then
+-  ICONV_LIBS="-liconv"
++  ICONV_LIBS="-lgiconv"
+   cat >> confdefs.h <<\EOF
+ #define USE_LIBICONV 1
+ EOF
+@@ -10897,7 +10897,7 @@
  s%@GTK_CFLAGS@%$GTK_CFLAGS%g
  s%@GTK_LIBS@%$GTK_LIBS%g
  s%@cflags_set@%$cflags_set%g
diff --git a/devel/gnomevfs/files/patch-ab b/devel/gnomevfs/files/patch-ab
index 5c79863db926..55058a4d496b 100644
--- a/devel/gnomevfs/files/patch-ab
+++ b/devel/gnomevfs/files/patch-ab
@@ -1,21 +1,23 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Tue Jan 22 11:51:36 2002
-+++ Makefile.in	Tue Jan 22 11:53:19 2002
-@@ -186,9 +186,9 @@
+--- Makefile.in.orig	Sun Mar 17 16:04:01 2002
++++ Makefile.in	Sun Mar 17 16:14:05 2002
+@@ -187,10 +187,10 @@
+ cflags_set = @cflags_set@
  cxxflags_set = @cxxflags_set@
  l = @l@
- @PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME = doc
+-@PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME = doc
 -@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = doc test
-+@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = doc
++@PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME = 
++@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = 
  
--SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				idl						modules						man						devel-docs					$(SUBDIRS_GNOME)				po
-+SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				idl						modules						man						$(SUBDIRS_GNOME)				po
+-SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				idl						modules						devel-docs					$(SUBDIRS_GNOME)				po
++SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				idl						modules						$(SUBDIRS_GNOME)				po
  
  
  EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					vfsConf.sh.in					xml-i18n-extract.in				xml-i18n-merge.in				xml-i18n-update.in				gnome-vfs-config.in
-@@ -196,7 +196,7 @@
+@@ -198,7 +198,7 @@
  
  bin_SCRIPTS = $(top_builddir)/gnome-vfs-config
  
@@ -24,7 +26,7 @@ $FreeBSD$
  confexec_DATA =  	vfsConf.sh
  
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -535,11 +535,13 @@
+@@ -537,11 +537,13 @@
  	    -e 's?\@VFS_INCLUDEDIR\@?$(VFS_INCLUDEDIR)?g' \
  	    -e 's?\@VERSION\@?$(VERSION)?g' \
  	    -e 's?\@VFS_LIBS\@?$(VFS_LIBS)?g' \
diff --git a/devel/gnomevfs/files/patch-ac b/devel/gnomevfs/files/patch-ac
index 03b8559abc77..29014f5e1e52 100644
--- a/devel/gnomevfs/files/patch-ac
+++ b/devel/gnomevfs/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- modules/Makefile.in.orig	Thu Jan 24 10:25:14 2002
-+++ modules/Makefile.in	Thu Jan 24 10:45:26 2002
-@@ -197,7 +197,7 @@
+--- 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 @@
  @HAVE_CDDA_TRUE@CDDA_LTLIBS = libcdda.la
  @HAVE_CDDA_FALSE@CDDA_LTLIBS = 
  
@@ -12,33 +12,11 @@ $FreeBSD$
  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)
-@@ -216,7 +216,6 @@
+@@ -217,7 +217,6 @@
+ ###  `cdda' method
  
  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
- 
-@@ -311,7 +310,7 @@
- libextfs_la_OBJECTS =  extfs-method.lo
- libfile_la_LIBADD = 
- libfile_la_OBJECTS =  file-method.lo
--libvfs_test_la_LDFLAGS = 
-+libvfs_test_la_LDFLAGS = $(module_flags)
- libvfs_test_la_DEPENDENCIES = 
- libvfs_test_la_OBJECTS =  test-method.lo
- libhttp_la_DEPENDENCIES = 
-@@ -320,10 +319,10 @@
- libbzip2_la_OBJECTS =  bzip2-method.lo
- libgzip_la_DEPENDENCIES = 
- libgzip_la_OBJECTS =  gzip-method.lo
--libftp_la_LDFLAGS = 
-+libftp_la_LDFLAGS = $(module_flags)
- libftp_la_LIBADD = 
- libftp_la_OBJECTS =  ftp-method.lo
--libnntp_la_LDFLAGS = 
-+libnntp_la_LDFLAGS = $(module_flags)
- libnntp_la_LIBADD = 
- libnntp_la_OBJECTS =  nntp-method.lo
- libvfs_pipe_la_DEPENDENCIES = 
diff --git a/devel/gnomevfs/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs/files/patch-libgnomevfs::Makefile.in
index c8ca73f68d60..77e49d02b783 100644
--- a/devel/gnomevfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs/files/patch-libgnomevfs::Makefile.in
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- libgnomevfs/Makefile.in	2001/09/17 14:32:27	1.1
-+++ libgnomevfs/Makefile.in	2001/09/17 14:33:02
-@@ -202,7 +202,7 @@
+--- libgnomevfs/Makefile.in.orig	Sun Mar 17 16:04:01 2002
++++ libgnomevfs/Makefile.in	Sun Mar 17 16:26:57 2002
+@@ -215,7 +215,7 @@
  
  
  # Platform specific includes
diff --git a/devel/gnomevfs/files/patch-libgnomevfs::gnome-vfs-mime-info.c b/devel/gnomevfs/files/patch-libgnomevfs::gnome-vfs-mime-info.c
new file mode 100644
index 000000000000..cb57b3afd83d
--- /dev/null
+++ b/devel/gnomevfs/files/patch-libgnomevfs::gnome-vfs-mime-info.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- libgnomevfs/gnome-vfs-mime-info.c	2002/03/17 13:33:30	1.1
++++ libgnomevfs/gnome-vfs-mime-info.c	2002/03/17 13:33:39
+@@ -46,7 +46,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
+-#include <iconv.h>
++#include <giconv.h>
+ #include <errno.h>
+ #include <stdlib.h>
+ 
diff --git a/devel/gnomevfs/files/patch-libgnomevfs::libcharset::Makefile.in b/devel/gnomevfs/files/patch-libgnomevfs::libcharset::Makefile.in
new file mode 100644
index 000000000000..090241b1c989
--- /dev/null
+++ b/devel/gnomevfs/files/patch-libgnomevfs::libcharset::Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- libgnomevfs/libcharset/Makefile.in	2002/03/17 14:28:57	1.1
++++ libgnomevfs/libcharset/Makefile.in	2002/03/17 14:30:13
+@@ -188,7 +188,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-INCLUDES =  	-DLIBDIR=\"$(libdir)\"
++INCLUDES =  	-DLIBDIR=\"$(prefix)/libdata\"
+ 
+ 
+ noinst_LTLIBRARIES = libcharset.la
+@@ -351,7 +351,7 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
+-install-exec-am: install-exec-local
++install-exec-am: 
+ install-exec: install-exec-am
+ 
+ install-data-am:
diff --git a/devel/gnomevfs/pkg-plist b/devel/gnomevfs/pkg-plist
index ff09a8d244e3..7b60552ebc43 100644
--- a/devel/gnomevfs/pkg-plist
+++ b/devel/gnomevfs/pkg-plist
@@ -111,7 +111,6 @@ 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 share/gnome/gtk-doc/html/gnome-vfs
 @dirrm lib/vfs/modules
 @dirrm lib/vfs/extfs
 @dirrm lib/vfs