Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1621956260105240"
MIME-Version: 1.0
Date: Tue, 25 May 2021 15:24:20 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/mail
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20210525152420.99DFEFA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1621956260105240
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Tue May 25 15:24:20 UTC 2021

Modified Files:
	pkgsrc/mail: Makefile
Added Files:
	pkgsrc/mail/s-nail: DESCR Makefile PLIST
	pkgsrc/mail/s-nail/patches: patch-make.rc

Log Message:
import mail/s-nail. via jgw@sdf.org, PR pkg/56111

S-nail (later S-mailx) provides a simple and friendly environment for
sending and receiving mail.  It is intended to provide the functionality
of the POSIX mailx(1) command, but is MIME capable and optionally offers
extensions for line editing, S/MIME, SMTP and POP3, among others.
It divides incoming mail into its constituent messages and allows the
user to deal with them in any order, offers many commands and variables
for manipulating messages and sending mail, as well as line editing, and
increasingly powerful scripting capabilities.


To generate a diff of this commit:
cvs rdiff -u -r1.569 -r1.570 pkgsrc/mail/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/s-nail/DESCR pkgsrc/mail/s-nail/Makefile \
    pkgsrc/mail/s-nail/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/s-nail/patches/patch-make.rc

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


--_----------=_1621956260105240
Content-Disposition: inline
Content-Length: 4147
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/Makefile
diff -u pkgsrc/mail/Makefile:1.569 pkgsrc/mail/Makefile:1.570
--- pkgsrc/mail/Makefile:1.569	Wed Apr 21 09:34:58 2021
+++ pkgsrc/mail/Makefile	Tue May 25 15:24:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.569 2021/04/21 09:34:58 nia Exp $
+# $NetBSD: Makefile,v 1.570 2021/05/25 15:24:20 nia Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -352,6 +352,7 @@ SUBDIR+=	ruby-mini_mime
 SUBDIR+=	ruby-roadie
 SUBDIR+=	ruby-roadie-rails
 SUBDIR+=	ruby-tmail
+SUBDIR+=	s-nail
 SUBDIR+=	safecat
 SUBDIR+=	sendmail
 SUBDIR+=	sendmail-cidrexpand

Added files:

Index: pkgsrc/mail/s-nail/DESCR
diff -u /dev/null pkgsrc/mail/s-nail/DESCR:1.1
--- /dev/null	Tue May 25 15:24:20 2021
+++ pkgsrc/mail/s-nail/DESCR	Tue May 25 15:24:20 2021
@@ -0,0 +1,8 @@
+S-nail (later S-mailx) provides a simple and friendly environment for
+sending and receiving mail.  It is intended to provide the functionality
+of the POSIX mailx(1) command, but is MIME capable and optionally offers
+extensions for line editing, S/MIME, SMTP and POP3, among others.
+It divides incoming mail into its constituent messages and allows the
+user to deal with them in any order, offers many commands and variables
+for manipulating messages and sending mail, as well as line editing, and
+increasingly powerful scripting capabilities.
Index: pkgsrc/mail/s-nail/Makefile
diff -u /dev/null pkgsrc/mail/s-nail/Makefile:1.1
--- /dev/null	Tue May 25 15:24:20 2021
+++ pkgsrc/mail/s-nail/Makefile	Tue May 25 15:24:20 2021
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2021/05/25 15:24:20 nia Exp $
+
+DISTNAME=		s-nail-14.9.22
+CATEGORIES=		mail
+MASTER_SITES=		https://www.sdaoden.eu/downloads/
+
+MAINTAINER=		jgw@sdf.org
+HOMEPAGE=		https://www.sdaoden.eu/code.html
+COMMENT=		BSD mail utility with MIME extensions
+LICENSE=		original-bsd AND osl AND mpl-1.1
+
+MAKE_FILE=		makefile
+
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+BUILD_MAKE_FLAGS+=	SYSCONFDIR=${PKG_SYSCONFDIR}
+INSTALL_MAKE_FLAGS+=	SYSCONFDIR=${EGDIR}
+
+CONF_FILES=		${EGDIR}/s-nail.rc ${PKG_SYSCONFDIR}/s-nail.rc
+
+.include "../../devel/libidn2/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/s-nail/PLIST
diff -u /dev/null pkgsrc/mail/s-nail/PLIST:1.1
--- /dev/null	Tue May 25 15:24:20 2021
+++ pkgsrc/mail/s-nail/PLIST	Tue May 25 15:24:20 2021
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2021/05/25 15:24:20 nia Exp $
+bin/s-nail
+libexec/s-nail-dotlock
+man/man1/s-nail.1
+share/examples/s-nail/s-nail.rc

Index: pkgsrc/mail/s-nail/patches/patch-make.rc
diff -u /dev/null pkgsrc/mail/s-nail/patches/patch-make.rc:1.1
--- /dev/null	Tue May 25 15:24:20 2021
+++ pkgsrc/mail/s-nail/patches/patch-make.rc	Tue May 25 15:24:20 2021
@@ -0,0 +1,37 @@
+$NetBSD: patch-make.rc,v 1.1 2021/05/25 15:24:20 nia Exp $
+
+ - fixed VAL_PREFIX, VAL_MANDIR and VAL_SYSCONFDIR for pkgsrc
+ - set OPT_AUTOCC=no to allow LDFLAGS in pkgsrc Makefile
+
+--- make.rc.orig        2021-02-23 18:38:16.000000000 -0700
++++ make.rc     2021-03-26 22:28:52.314771598 -0600
+@@ -62,7 +62,7 @@
+ VAL_PS_DOTLOCK_USER=root
+
+ # General prefix of installation.
+-VAL_PREFIX=/usr/local
++VAL_PREFIX=$PREFIX
+
+ # Fine tune individual locations, normally under $VAL_PREFIX.
+ # . the place of normal binaries.
+@@ -72,9 +72,9 @@
+ #   (Only with: $OPT_DOTLOCK.)
+ VAL_LIBEXECDIR=${VAL_PREFIX}/libexec
+ # . of the manual.
+-VAL_MANDIR=${VAL_PREFIX}/share/man
++VAL_MANDIR=${VAL_PREFIX}/man
+ # . of the exemplary resource file.
+-VAL_SYSCONFDIR=${VAL_PREFIX}/etc
++VAL_SYSCONFDIR=${VAL_PREFIX}/share/examples/s-nail
+
+ # The variable $DESTDIR is prepended to all the paths from above at
+ # installation time; this feature can be used for, e.g., package
+@@ -193,7 +193,7 @@
+ #     $ make EXTRA_CFLAGS=-std=c99 tangerine
+ # Whatever you do, the configuration is fixated and updates will force
+ # rebuilds.
+-OPT_AUTOCC=yes
++OPT_AUTOCC=no
+
+    # With $OPT_AUTOCC we will use stack protector guards shall the
+    # detected compiler support them; this goes in line with our own


--_----------=_1621956260105240--