update builtin solaris gssapi/mit-krb5 support for gnome-vfs

3 files changed, 31 insertions, 8 deletions

diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index b1937df2e07..c276a581aec 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.34 2013/04/19 20:02:22 prlw1 Exp $
+$NetBSD: distinfo,v 1.35 2013/10/12 04:39:01 richard Exp $
 
 SHA1 (gnome-vfs-2.24.4.tar.bz2) = 0dc634e7dd979fd218f378902c0ca1af80738961
 RMD160 (gnome-vfs-2.24.4.tar.bz2) = 6a5952bea02dfc96782b6f1129fe765f5313a75b
 Size (gnome-vfs-2.24.4.tar.bz2) = 1890370 bytes
 SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
-SHA1 (patch-ae) = 2e46f1311674265d2054c7209aa057d8da2aca67
+SHA1 (patch-ae) = 42f8f07f8729ad1fb88bd9f0032d7450c6d2c8c5
 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
 SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9
diff --git a/sysutils/gnome-vfs/options.mk b/sysutils/gnome-vfs/options.mk
index 43fd232ca1f..faac479c0c4 100644
--- a/sysutils/gnome-vfs/options.mk
+++ b/sysutils/gnome-vfs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:03 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2013/10/12 04:39:01 richard Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-vfs
@@ -23,7 +23,9 @@ CONFIGURE_ARGS+=	--disable-fam
 
 .if !empty(PKG_OPTIONS:Mgssapi)
 .include "../../mk/krb5.buildlink3.mk"
+.	if !empty(USE_BUILTIN.${KRB5_TYPE}:M[yY][eE][sS])
 CONFIGURE_ENV+=		KRB5_CONFIG=${SH_KRB5_CONFIG}
+.	endif
 .else
 CONFIGURE_ENV+=		ac_cv_path_KRB5_CONFIG=none
 .endif
diff --git a/sysutils/gnome-vfs/patches/patch-ae b/sysutils/gnome-vfs/patches/patch-ae
index d3397f8d642..eb49d9bcb0e 100644
--- a/sysutils/gnome-vfs/patches/patch-ae
+++ b/sysutils/gnome-vfs/patches/patch-ae
@@ -1,4 +1,7 @@
-$NetBSD: patch-ae,v 1.10 2010/10/22 20:11:17 drochner Exp $
+$NetBSD: patch-ae,v 1.11 2013/10/12 04:39:01 richard Exp $
+
+builtin krb5-config in platforms such as solaris do not support
+the gssapi option, and need an explicit -lgss
 
 --- configure.orig	2010-09-28 09:35:20.000000000 +0000
 +++ configure
@@ -23,7 +26,25 @@ $NetBSD: patch-ae,v 1.10 2010/10/22 20:11:17 drochner Exp $
    return 0;
  }
  _ACEOF
-@@ -17533,7 +17535,7 @@ $as_echo "#define HAVE_SAMBA /**/" >>con
+@@ -15717,9 +15719,14 @@ fi
+
+
+ if test "x$KRB5_CONFIG" != "xnone"; then
+-   GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+-   GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+-
++	# make sure krb5-config supports gssapi option
++	if $KRB5_CONFIG --libs gssapi 2>&1 | grep "Unknown option" > /dev/null ; then
++		GSSAPI_LIBS="`${KRB5_CONFIG} --libs` -lgss"
++   	GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags`"
++	else
++		GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
++   	GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
++	fi
+    saved_CPPFLAGS="$CPPFLAGS"
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS $GSSAPI_LIBS"
+@@ -17533,7 +17540,7 @@ $as_echo "#define HAVE_SAMBA /**/" >>con
  
  		msg_samba="yes"
                  if test x$with_samba_libs != x/usr/lib; then
@@ -32,7 +53,7 @@ $NetBSD: patch-ae,v 1.10 2010/10/22 20:11:17 drochner Exp $
                  else
                  	SAMBA_LIBS="-lsmbclient"
                  fi
-@@ -19370,12 +19372,12 @@ if test -n "$LIBGNOMEVFS_CFLAGS"; then
+@@ -19370,12 +19377,12 @@ if test -n "$LIBGNOMEVFS_CFLAGS"; then
      pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -48,7 +69,7 @@ $NetBSD: patch-ae,v 1.10 2010/10/22 20:11:17 drochner Exp $
  else
    pkg_failed=yes
  fi
-@@ -19386,12 +19388,12 @@ if test -n "$LIBGNOMEVFS_LIBS"; then
+@@ -19386,12 +19393,12 @@ if test -n "$LIBGNOMEVFS_LIBS"; then
      pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -64,7 +85,7 @@ $NetBSD: patch-ae,v 1.10 2010/10/22 20:11:17 drochner Exp $
  else
    pkg_failed=yes
  fi
-@@ -19411,14 +19413,14 @@ else
+@@ -19411,14 +19418,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then