s-nail: removed patch in favor of make flags

[Kevin Bloom <kevin.bloom%posteo.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Thu Jan 4 20:52:24 2024 -0500
Changeset:	2249659074cf37f0aff4d6d3f69a2336fe03eac7

Modified Files:
	s-nail/COMMIT_MSG
	s-nail/Makefile
	s-nail/distinfo
Removed Files:
	s-nail/patches/patch-make.rc

Log Message:
s-nail: removed patch in favor of make flags

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2249659074cf37f0aff4d6d3f69a2336fe03eac7

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

diffstat:
 s-nail/COMMIT_MSG            |  3 +++
 s-nail/Makefile              |  5 ++++-
 s-nail/distinfo              |  1 -
 s-nail/patches/patch-make.rc | 37 -------------------------------------
 4 files changed, 7 insertions(+), 39 deletions(-)

diffs:
diff --git a/s-nail/COMMIT_MSG b/s-nail/COMMIT_MSG
index ad8abd6487..279c88546c 100644
--- a/s-nail/COMMIT_MSG
+++ b/s-nail/COMMIT_MSG
@@ -2,6 +2,9 @@ s-nail: updated s-nail to 14.9.24
 
 Update prepared in wip by Kevin Bloom.
 
+Packaging updates:
+- removed unneeded patch in favor of MAKE_FLAGS
+
 14.9.23 -> 14.9.24:
 - Release tarball might be in --format=pax
 - Again honour MTA arguments passed after the "--" command line
diff --git a/s-nail/Makefile b/s-nail/Makefile
index 0973a19361..a5cae380e6 100644
--- a/s-nail/Makefile
+++ b/s-nail/Makefile
@@ -4,7 +4,7 @@ DISTNAME=		s-nail-14.9.24
 CATEGORIES=		mail
 MASTER_SITES=		https://www.sdaoden.eu/downloads/
 
-MAINTAINER=		jgw%sdf.org@localhost
+MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		https://www.sdaoden.eu/code.html
 COMMENT=		BSD mail utility with MIME extensions
 LICENSE=		original-bsd AND osl AND mpl-1.1
@@ -12,7 +12,10 @@ LICENSE=		original-bsd AND osl AND mpl-1.1
 MAKE_FILE=		makefile
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+MAKE_FLAGS+=		VAL_PREFIX=${PREFIX}
 MAKE_FLAGS+=		VAL_MANDIR=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=		VAL_SYSCONFDIR=${EGDIR}
+MAKE_FLAGS+=		OPT_AUTOCC=no
 BUILD_MAKE_FLAGS+=	SYSCONFDIR=${PKG_SYSCONFDIR}
 INSTALL_MAKE_FLAGS+=	SYSCONFDIR=${EGDIR}
 
diff --git a/s-nail/distinfo b/s-nail/distinfo
index d8baca79b1..90dc02538f 100644
--- a/s-nail/distinfo
+++ b/s-nail/distinfo
@@ -3,4 +3,3 @@ $NetBSD: distinfo,v 1.3 2021/10/26 10:54:29 nia Exp $
 BLAKE2s (s-nail-14.9.24.tar.gz) = 649bd9205d714677bcdefdef0d5370432025d20858d06f99d3a0cb728c815a0d
 SHA512 (s-nail-14.9.24.tar.gz) = 15101019a9c14fef8162fbce1a15133d2c70f27476b08a7f183d195fb52ed2854731984f833236c543fd681e299c3d93ec508154573b5897d707a0ec5c216575
 Size (s-nail-14.9.24.tar.gz) = 1105199 bytes
-SHA1 (patch-make.rc) = 383372deed01c34a984c8696c3d15619aa04aafa
diff --git a/s-nail/patches/patch-make.rc b/s-nail/patches/patch-make.rc
deleted file mode 100644
index ac057ca3cb..0000000000
--- a/s-nail/patches/patch-make.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-$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