multimail: use a 'do-install' target instead of patching upstream Makefile.

[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 11:52:55 2019 +0200
Changeset:	698fe14c6e8046f22bf3e3879c74f3e75b540ee6

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

Log Message:
multimail: use a 'do-install' target instead of patching upstream Makefile.

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

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

diffstat:
 multimail/Makefile               |  5 ++++-
 multimail/PLIST                  |  1 -
 multimail/distinfo               |  2 +-
 multimail/patches/patch-Makefile | 27 ++-------------------------
 4 files changed, 7 insertions(+), 28 deletions(-)

diffs:
diff --git a/multimail/Makefile b/multimail/Makefile
index 678ed7b15c..58b395a7ab 100644
--- a/multimail/Makefile
+++ b/multimail/Makefile
@@ -15,8 +15,11 @@ DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 
-AUTO_MKDIRS=		yes
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/mm ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/mm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimail/PLIST b/multimail/PLIST
index 176826c73d..04e63fbc07 100644
--- a/multimail/PLIST
+++ b/multimail/PLIST
@@ -1,4 +1,3 @@
 @comment $NetBSD$
 bin/mm
 man/man1/mm.1
-man/man1/mmail.1
diff --git a/multimail/distinfo b/multimail/distinfo
index 045019f1ea..d325d8e648 100644
--- a/multimail/distinfo
+++ b/multimail/distinfo
@@ -4,4 +4,4 @@ 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) = e98763d296b1868321f19dd31e830d92aadce1cf
+SHA1 (patch-Makefile) = 43eaae7f05ff3b51eeddb2da14b6273a66ef43d5
diff --git a/multimail/patches/patch-Makefile b/multimail/patches/patch-Makefile
index 32a107f729..7a53bb57e6 100644
--- a/multimail/patches/patch-Makefile
+++ b/multimail/patches/patch-Makefile
@@ -1,10 +1,10 @@
 $NetBSD$
 
-Honour CXXFLAGS, and adapt install target for pkgsrc.
+Honour CXXFLAGS.
 
 --- Makefile.orig	2019-02-22 01:00:59.000000000 +0000
 +++ Makefile
-@@ -11,14 +11,15 @@ isrc = interfac
+@@ -11,7 +11,7 @@ isrc = interfac
  ifeq ($(DEBUG),Y)
  	OPTS = -g -Wall -pedantic
  else
@@ -13,26 +13,3 @@ Honour CXXFLAGS, and adapt install target for pkgsrc.
  	POST = strip mm$(E)
  endif
  
- # PREFIX is the base directory under which to install the binary and man
- # page; generally either /usr/local or /usr (or perhaps /opt...).
- 
--PREFIX = /usr/local
-+DESTDIR ?=
-+PREFIX ?= /usr/local
- 
- #--------------------------------------------------------------
- # Defaults are for the standard curses setup:
-@@ -106,9 +107,9 @@ clean:
- 	$(RM) mm$(E)
- 
- install::
--	install -c -s mm $(PREFIX)/bin
--	install -c -m 644 mm.1 $(HELPDIR)
--	$(RM) $(HELPDIR)/mmail.1
--	ln $(HELPDIR)/mm.1 $(HELPDIR)/mmail.1
-+	install -c -s mm $(DESTDIR)$(PREFIX)/bin
-+	install -c -m 644 mm.1 $(DESTDIR)$(HELPDIR)
-+	$(RM) $(DESTDIR)$(HELPDIR)/mmail.1
-+	ln $(HELPDIR)/mm.1 $(DESTDIR)$(HELPDIR)/mmail.1
- 
- include depend