Update to 14.4.4; bugfixes and requested by the author

Testing and ok jca@
kerberos bits ok ajacoutot@

mail/s-nail/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2013/06/25 02:44:16 william Exp $
+# $OpenBSD: Makefile,v 1.7 2013/11/07 03:34:58 william Exp $
 
 COMMENT=		enhanced, MIME capable Berkeley Mail
 
-DISTNAME=		s-nail-14.3.2
+DISTNAME=		s-nail-14.4.4
 DISTFILES=		${DISTNAME:S/./_/g}.tar.gz
 CATEGORIES=		mail
 HOMEPAGE=		http://sdaoden.users.sourceforge.net/code.html#s-nail
-REVISION=		2
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -19,13 +18,18 @@ MAINTAINER=		William Yodlowsky <william@openbsd.org>
 
 MODULES=		converters/libiconv
 
-MAKE_FLAGS=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-                        LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-			SYSCONFDIR=${SYSCONFDIR} \
-			CONFIG=CUSTOM
+MAKE_FILE=		makefile
+MAKE_FLAGS=		CFLAGS="${CFLAGS}" \
+			C_INCLUDE_PATH="${LOCALBASE}/include" \
+			LDFLAGS="${LDFLAGS}" \
+			LD_LIBRARY_PATH=${LOCALBASE}/lib \
+			SYSCONFDIR="${SYSCONFDIR}" \
+			WANT_EDITLINE=1 \
+			WANT_GSSAPI=1
 
 LIB_DEPENDS=		devel/libidn
 
+INSTALL_TARGET=		packager-install
 NO_TEST=		Yes
 
 post-install:

mail/s-nail/distinfo

@@ -1,2 +1,2 @@
-SHA256 (s-nail-14_3_2.tar.gz) = xX5EhLjwR+s9z4XfOT/T6mR71gLbvG/syEybA7et+Qo=
-SIZE (s-nail-14_3_2.tar.gz) = 361225
+SHA256 (s-nail-14_4_4.tar.gz) = aY/oiZj7jnVEI8chq5YosnHXWDsGf8Sk30YosL/LMw8=
+SIZE (s-nail-14_4_4.tar.gz) = 393960

mail/s-nail/patches/patch-makeconfig

@@ -1,27 +0,0 @@
-$OpenBSD: patch-makeconfig,v 1.1 2013/06/17 19:30:44 ajacoutot Exp $
---- makeconfig.orig	Wed May  1 16:31:18 2013
-+++ makeconfig	Mon Jun 17 11:59:07 2013
-@@ -5,6 +5,12 @@
- [ -z "${WANT_NOALLOCA}" ] && WANT_NOALLOCA=0
- [ -z "${WANT_NOGETOPT}" ] && WANT_NOGETOPT=0
- 
-+KRB5_CONFIG=`which krb5-config 2>/dev/null`
-+if [ -x ${KRB5_CONFIG} ]; then
-+	GSSAPI_LIBS=`/usr/bin/krb5-config --libs gssapi`
-+	GSSAPI_INCS=`/usr/bin/krb5-config --cflags`
-+fi
-+
- if [ -z "${CONFIG}" ]; then
- 	[ -f ./user.conf ] && . ./user.conf
- else
-@@ -599,8 +605,8 @@ int main(void)
- 			'for GSSAPI in libgssapi, OpenBSD-style' \
- 			'#define USE_GSSAPI
- 			#define	GSSAPI_REG_INCLUDE' \
--			'-lgssapi -lkrb5 -lcrypto' \
--			'-I/usr/include/kerberosV' || \
-+			"${GSSAPI_LIBS}" \
-+			"${GSSAPI_INCS}" || \
- 		< ${tmp2}.c link_check gssapi 'for GSSAPI in libgss' \
- 			'#define USE_GSSAPI' \
- 			'-lgss' || \

mail/s-nail/patches/patch-makefile

@@ -0,0 +1,16 @@
+$OpenBSD: patch-makefile,v 1.1 2013/11/07 03:34:58 william Exp $
+
+Upstream commit a8c1b0
+
+
+--- makefile.orig	Sat Oct 12 18:52:19 2013
++++ makefile	Sat Oct 12 18:53:21 2013
+@@ -9,7 +9,7 @@ all:
+ install:
+ 	@$(_prego) && $(MAKE) -f mk.mk install
+ packager-install:
+-	@@(_prestop) && $(MAKE) -f mk.mk install
++	@$(_prestop) && $(MAKE) -f mk.mk install
+ uninstall:
+ 	@$(_prestop) && $(MAKE) -f mk.mk uninstall
+ clean:

mail/s-nail/patches/patch-mk-mk_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mk-mk_in,v 1.1 2013/11/07 03:34:58 william Exp $
+--- mk-mk.in.orig	Sat Oct 12 18:39:56 2013
++++ mk-mk.in	Sat Oct 12 18:40:02 2013
+@@ -16,7 +16,7 @@ EXT_CFLAGS = -std=c89 -O2 -g \
+ 
+ .SUFFIXES: .o .c .y
+ .c.o:
+-	@echo CC $<; $(CC) $(CFLAGS) $(INCLUDES) -c $<
++	$(CC) $(CFLAGS) $(INCLUDES) -c $<
+ .c .y: ;
+ 
+ all: echoes $(UAGENT)

mail/s-nail/patches/patch-nail_rc

@@ -1,8 +1,8 @@
-$OpenBSD: patch-nail_rc,v 1.1.1.1 2013/03/29 03:54:34 william Exp $
+$OpenBSD: patch-nail_rc,v 1.2 2013/11/07 03:34:58 william Exp $
 
---- nail.rc.orig	Fri Mar  3 19:01:19 2006
-+++ nail.rc	Mon Apr 24 10:44:06 2006
-@@ -17,6 +17,9 @@ set append
+--- nail.rc.orig	Thu Oct  3 09:42:46 2013
++++ nail.rc	Sat Oct 12 18:35:29 2013
+@@ -14,6 +14,9 @@ set append
  # Ask for a message subject.
  set ask