multimail: use the SUBST framework to add $(CXXFLAGS) to OPTS.

[Frederic Cambus <fred%statdns.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Frederic Cambus <fred%statdns.com@localhost>
Pushed By:	fcambus
Date:		Thu Sep 12 12:28:14 2019 +0200
Changeset:	6726aa5b593adaff2d85720fd1020efee05a4ed5

Modified Files:
	multimail/Makefile
	multimail/distinfo
Removed Files:
	multimail/patches/patch-Makefile

Log Message:
multimail: use the SUBST framework to add $(CXXFLAGS) to OPTS.

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

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

diffstat:
 multimail/Makefile               |  6 ++++++
 multimail/distinfo               |  1 -
 multimail/patches/patch-Makefile | 15 ---------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diffs:
diff --git a/multimail/Makefile b/multimail/Makefile
index 58b395a7ab..610e910497 100644
--- a/multimail/Makefile
+++ b/multimail/Makefile
@@ -15,6 +15,12 @@ DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 
+SUBST_CLASSES+=		makefile
+SUBST_STAGE.makefile=	pre-configure
+SUBST_MESSAGE.makefile=	Adjust Makefile
+SUBST_FILES.makefile=	Makefile
+SUBST_SED.makefile+=	-e '/^	OPTS/ s,-O2,$${CXXFLAGS},'
+
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 do-install:
diff --git a/multimail/distinfo b/multimail/distinfo
index d325d8e648..8efbb296c6 100644
--- a/multimail/distinfo
+++ b/multimail/distinfo
@@ -4,4 +4,3 @@ SHA1 (mmail-0.52.tar.gz) = 6a0e2d9ed1bdf1c00afae15f008a7f7e4850b0fa
 RMD160 (mmail-0.52.tar.gz) = b518caf178399540b0384bbc54aae0fa0bf172d5
 SHA512 (mmail-0.52.tar.gz) = 2e0b834db289ec94d893deb0250dcc44e826ca7cbf28c6e39b23c3ac9a008e7f5da6a584d0f32547ca057c5ae44c3d84bbe0833bb1b8bb6df4f652174ee139b4
 Size (mmail-0.52.tar.gz) = 221721 bytes
-SHA1 (patch-Makefile) = 43eaae7f05ff3b51eeddb2da14b6273a66ef43d5
diff --git a/multimail/patches/patch-Makefile b/multimail/patches/patch-Makefile
deleted file mode 100644
index 7a53bb57e6..0000000000
--- a/multimail/patches/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Honour CXXFLAGS.
-
---- Makefile.orig	2019-02-22 01:00:59.000000000 +0000
-+++ Makefile
-@@ -11,7 +11,7 @@ isrc = interfac
- ifeq ($(DEBUG),Y)
- 	OPTS = -g -Wall -pedantic
- else
--	OPTS = -O2 -Wall -pedantic
-+	OPTS = $(CXXFLAGS) -Wall -pedantic
- 	POST = strip mm$(E)
- endif
-