CVS commit: pkgsrc/mail/neomutt

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jun 30 10:53:22 UTC 2017

Modified Files:
        pkgsrc/mail/neomutt: distinfo options.mk
Added Files:
        pkgsrc/mail/neomutt/patches: patch-configure.ac patch-m4_gssapi.m4

Log Message:
Bring over Solaris GSSAPI patches from mail/mutt.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/neomutt/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/neomutt/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/neomutt/patches/patch-configure.ac \
    pkgsrc/mail/neomutt/patches/patch-m4_gssapi.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/neomutt/distinfo
diff -u pkgsrc/mail/neomutt/distinfo:1.21 pkgsrc/mail/neomutt/distinfo:1.22
--- pkgsrc/mail/neomutt/distinfo:1.21   Wed Jun 14 16:07:12 2017
+++ pkgsrc/mail/neomutt/distinfo        Fri Jun 30 10:53:22 2017
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.21 2017/06/14 16:07:12 wiz Exp $
+$NetBSD: distinfo,v 1.22 2017/06/30 10:53:22 jperkin Exp $
 
 SHA1 (neomutt-20170609.tar.gz) = fd0e07e95c4a5dc6b21df02ea1c0355acf1fcc17
 RMD160 (neomutt-20170609.tar.gz) = 3b2b696bd48e6a0b846c20b6621fe92dd996d6b3
 SHA512 (neomutt-20170609.tar.gz) = e5ced8e2d5890e828a1603a0c1c8072bbb84499e87b45b55029b4644e6b70efb0ece00f600d9a942cb033a7b62d6b60a91ef17523fb34e8ef3d3abbe35905c9e
 Size (neomutt-20170609.tar.gz) = 2637349 bytes
+SHA1 (patch-configure.ac) = 06ac40f21edc715150d944279e820b2d684fd5c3
+SHA1 (patch-m4_gssapi.m4) = 8b43c7af9afd8beb7c16ef2140f7f6a7c20a05e5

Index: pkgsrc/mail/neomutt/options.mk
diff -u pkgsrc/mail/neomutt/options.mk:1.7 pkgsrc/mail/neomutt/options.mk:1.8
--- pkgsrc/mail/neomutt/options.mk:1.7  Wed Jun 21 07:10:56 2017
+++ pkgsrc/mail/neomutt/options.mk      Fri Jun 30 10:53:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2017/06/21 07:10:56 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2017/06/30 10:53:22 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.neomutt
 PKG_OPTIONS_REQUIRED_GROUPS=   display
@@ -14,10 +14,10 @@ PKG_SUGGESTED_OPTIONS+=     mutt-hcache toky
 ###
 ### GSSAPI
 ###
-
+CONFIGURE_ENV+=                ac_cv_path_KRB5CFGPATH=${KRB5_CONFIG}
 .if !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+= --with-gss=${KRB5BASE}
+CONFIGURE_ARGS+=       --with-gss=${KRB5BASE}
 .endif
 
 ###

Added files:

Index: pkgsrc/mail/neomutt/patches/patch-configure.ac
diff -u /dev/null pkgsrc/mail/neomutt/patches/patch-configure.ac:1.1
--- /dev/null   Fri Jun 30 10:53:22 2017
+++ pkgsrc/mail/neomutt/patches/patch-configure.ac      Fri Jun 30 10:53:22 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2017/06/30 10:53:22 jperkin Exp $
+
+Handle native Solaris GSSAPI.
+
+--- configure.ac.orig  2017-06-09 10:52:07.000000000 +0000
++++ configure.ac
+@@ -494,7 +494,7 @@ if test "$gss_prefix" != "no"; then
+               AC_CACHE_SAVE
+               AC_MSG_RESULT([GSSAPI libraries not found])
+       fi
+-      if test "$GSSAPI_IMPL" = "Heimdal"; then
++      if test "$GSSAPI_IMPL" = "Heimdal" || test "$GSSAPI_IMPL" = "Solaris"; then
+               AC_DEFINE(HAVE_HEIMDAL,1,[ Define if your GSSAPI implementation is Heimdal ])
+       fi
+       CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
Index: pkgsrc/mail/neomutt/patches/patch-m4_gssapi.m4
diff -u /dev/null pkgsrc/mail/neomutt/patches/patch-m4_gssapi.m4:1.1
--- /dev/null   Fri Jun 30 10:53:22 2017
+++ pkgsrc/mail/neomutt/patches/patch-m4_gssapi.m4      Fri Jun 30 10:53:22 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-m4_gssapi.m4,v 1.1 2017/06/30 10:53:22 jperkin Exp $
+
+Handle native Solaris GSSAPI.
+
+--- m4/gssapi.m4.orig  2017-06-09 10:52:07.000000000 +0000
++++ m4/gssapi.m4
+@@ -28,6 +28,7 @@ AC_DEFUN([MUTT_AM_PATH_GSSAPI],
+     case "`$KRB5CFGPATH --version`" in
+       "Kerberos 5 "*) GSSAPI_IMPL="MIT";;
+       ?eimdal*)               GSSAPI_IMPL="Heimdal";;
++      Solaris*)               GSSAPI_IMPL="Solaris";;
+       *)              GSSAPI_IMPL="Unknown";;
+    esac
+   else