remove remainders from pre-libgnutls-config.mk attempts to

fix the gnutls-2.8 problem

3 files changed, 9 insertions, 26 deletions

diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common
index 7d2355d73fb..b56b3141aea 100644
--- a/sysutils/gnome-vfs/Makefile.common
+++ b/sysutils/gnome-vfs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2009/07/02 19:25:47 tnn Exp $
+# $NetBSD: Makefile.common,v 1.22 2009/07/03 16:05:28 drochner Exp $
 #
 # used by audio/gnome-vfs-cdda/Makefile
 # used by net/gnome-vfs-dns-sd/Makefile
@@ -18,7 +18,6 @@ COMMENT=		GNOME Virtual File System (v2)
 
 DISTINFO_FILE=		${.CURDIR}/../../sysutils/gnome-vfs/distinfo
 PATCHDIR=		${.CURDIR}/../../sysutils/gnome-vfs/patches
-FILESDIR=		${.CURDIR}/../../sysutils/gnome-vfs/files
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index a70b6cfdd6a..649f5589b99 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.27 2009/06/10 14:50:39 wiz Exp $
+$NetBSD: distinfo,v 1.28 2009/07/03 16:05:28 drochner Exp $
 
 SHA1 (gnome-vfs-2.24.1.tar.bz2) = 0e7b548ffe7b9eddaef3a43cdda47de538715f8b
 RMD160 (gnome-vfs-2.24.1.tar.bz2) = e4c6f99b67496a456596b7040aff859ca49a8998
 Size (gnome-vfs-2.24.1.tar.bz2) = 1936704 bytes
 SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
-SHA1 (patch-ae) = 7a3daf8585efd4fbede277fddaa9047db4ade915
+SHA1 (patch-ae) = 414d92d95694cd45bad7a34c381e55a46e3e8eae
 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
 SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9
diff --git a/sysutils/gnome-vfs/patches/patch-ae b/sysutils/gnome-vfs/patches/patch-ae
index 5b55e3ec9ee..3a1b50ac915 100644
--- a/sysutils/gnome-vfs/patches/patch-ae
+++ b/sysutils/gnome-vfs/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.8 2009/06/10 14:50:39 wiz Exp $
+$NetBSD: patch-ae,v 1.9 2009/07/03 16:05:28 drochner Exp $
 
---- configure.orig	2009-03-17 13:55:00.000000000 +0000
+--- configure.orig	2009-03-17 14:55:00.000000000 +0100
 +++ configure
 @@ -25874,7 +25874,7 @@ fi
  
@@ -32,23 +32,7 @@ $NetBSD: patch-ae,v 1.8 2009/06/10 14:50:39 wiz Exp $
                  else
                  	SAMBA_LIBS="-lsmbclient"
                  fi
-@@ -35859,11 +35861,10 @@ rm -f core conftest.err conftest.$ac_obj
-           LIBS="$ac_save_LIBS"
-        fi
-      fi
--     LIBGNUTLS_CFLAGS=""
--     LIBGNUTLS_LIBS=""
--     { { $as_echo "$as_me:$LINENO: error: Unable to find GNUTLS" >&5
--$as_echo "$as_me: error: Unable to find GNUTLS" >&2;}
--   { (exit 1); exit 1; }; }
-+LIBGNUTLS_CFLAGS=`pkg-config gnutls --cflags`
-+LIBGNUTLS_LIBS=`pkg-config gnutls --libs`
-+libgnutls_config_version=`pkg-config gnutls --version`
-+have_ssl=true
-   fi
-   rm -f conf.libgnutlstest
- 
-@@ -37509,12 +37510,12 @@ if test -n "$LIBGNOMEVFS_CFLAGS"; then
+@@ -37509,12 +37511,12 @@ if test -n "$LIBGNOMEVFS_CFLAGS"; then
      pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -64,7 +48,7 @@ $NetBSD: patch-ae,v 1.8 2009/06/10 14:50:39 wiz Exp $
  else
    pkg_failed=yes
  fi
-@@ -37525,12 +37526,12 @@ if test -n "$LIBGNOMEVFS_LIBS"; then
+@@ -37525,12 +37527,12 @@ if test -n "$LIBGNOMEVFS_LIBS"; then
      pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -80,7 +64,7 @@ $NetBSD: patch-ae,v 1.8 2009/06/10 14:50:39 wiz Exp $
  else
    pkg_failed=yes
  fi
-@@ -37548,14 +37549,14 @@ else
+@@ -37548,14 +37550,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -98,7 +82,7 @@ $NetBSD: patch-ae,v 1.8 2009/06/10 14:50:39 wiz Exp $
  
  $LIBGNOMEVFS_PKG_ERRORS
  
-@@ -37566,7 +37567,7 @@ Alternatively, you may set the environme
+@@ -37566,7 +37568,7 @@ Alternatively, you may set the environme
  and LIBGNOMEVFS_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5