From b3461a5f70ba662847b9c71c07242a0696369b22 Mon Sep 17 00:00:00 2001
From: Frederic Cambus <fred@statdns.com>
Date: Wed, 3 Apr 2019 15:54:49 +0200
Subject: [PATCH] multimail: update to 0.52.

ChangeLog:

- Support extended length (71 character) To: and From: fields in QWKE
  replies. Reported by "g00r00" et al.
- For system names between 6 and 10 characters, use "MMail/name" instead
  of "MultiMail" for the Blue Wave tear line.
- Fixes for various warnings when building with current compilers; less
  cluttered build output.
- Use CURS_DIR to specify the default library location on the command
  line when building; removed references to CURS_LIB and CURS_INC.
  Partly due to Rob Swindell.
- Use "SYS=DOS" with Makefile.bcc, as with others, instead of "DOS=Y".
- Makefiles renamed PDCurses-style, for a simpler build process.
- Binaries built against PDCurses current git (post-3.8); Makefiles
  modified accordingly.
- Cleaned up documentation; also, the man page and README no longer
  include the version number, which is now only specified in config.h
  (and here).
---
 multimail/Makefile               |  4 ++--
 multimail/distinfo               | 10 +++++-----
 multimail/patches/patch-Makefile | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/multimail/Makefile b/multimail/Makefile
index 926f172edd..b1f479b7f4 100644
--- a/multimail/Makefile
+++ b/multimail/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD$
 
-DISTNAME=	mmail-0.51
+DISTNAME=	mmail-0.52
 CATEGORIES=	news
-MASTER_SITES=	https://downloads.sourceforge.net/project/multimail/MultiMail/0.51/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=multimail/}
 
 MAINTAINER=	fred@statdns.com
 HOMEPAGE=	https://multimail.sourceforge.io/
diff --git a/multimail/distinfo b/multimail/distinfo
index d2fd9284e0..f4e94b5870 100644
--- a/multimail/distinfo
+++ b/multimail/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (mmail-0.51.tar.gz) = eb16f372af41079da17b9f792008e90a5086ff24
-RMD160 (mmail-0.51.tar.gz) = d64e3c31e48f32ac25e5922bf3fe48fdcd23d01d
-SHA512 (mmail-0.51.tar.gz) = 8a7e0f450c204b927e9a01461abc51f5cd278d26d9110efc919dbe04d1b4c90c39dbd71f3ed5db186184070d5d25dcdc3cb1322edcc75dbd6117ecb400666072
-Size (mmail-0.51.tar.gz) = 220574 bytes
-SHA1 (patch-Makefile) = 69c9263c3ab799e155483aeade79573ae55cd758
+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) = beff612a3b60a2e8ad2f45b685a925e5d2af95c8
diff --git a/multimail/patches/patch-Makefile b/multimail/patches/patch-Makefile
index 73322e8e2c..7704cbd0c5 100644
--- a/multimail/patches/patch-Makefile
+++ b/multimail/patches/patch-Makefile
@@ -2,7 +2,7 @@ $NetBSD$
 
 Link against ncursesw and adapt install target for pkgsrc.
 
---- Makefile.orig	2018-03-29 09:26:02.000000000 +0000
+--- Makefile.orig	2019-02-22 01:00:59.000000000 +0000
 +++ Makefile
 @@ -18,7 +18,8 @@ endif
  # PREFIX is the base directory under which to install the binary and man
@@ -14,25 +14,25 @@ Link against ncursesw and adapt install target for pkgsrc.
  
  #--------------------------------------------------------------
  # Defaults are for the standard curses setup:
-@@ -41,7 +42,7 @@ ifeq ($(OS),Windows_NT)
+@@ -37,7 +38,7 @@ ifeq ($(OS),Windows_NT)
+ 	E = .exe
  else
  	CURS_DIR = .
- 	CURS_LIB = .
 -	LIBS = -lcurses
 +	LIBS = -lncursesw
  	RM = rm -f
  	SEP = ;
  	E =
-@@ -101,7 +102,7 @@ $(IOBJS) : %.o: $(isrc)/%.cc
- 	$(CXX) $(CPPFLAGS) -c $<
+@@ -94,7 +95,7 @@ $(IOBJS) : %.o: $(isrc)/%.cc
+ 	$(CXX) $(OPTS) -I$(CURS_DIR) -c $<
  
  mm$(E):	$(MOBJS) $(IOBJS)
--	$(CXX) -o mm$(E) $(MOBJS) $(IOBJS) -L$(CURS_LIB) $(LIBS)
-+	$(CXX) -o mm$(E) $(MOBJS) $(IOBJS) -L$(CURS_LIB) $(LIBS) $(LDFLAGS)
+-	$(CXX) -o mm$(E) $(MOBJS) $(IOBJS) $(LIBS)
++	$(CXX) -o mm$(E) $(MOBJS) $(IOBJS) $(LIBS) $(LDFLAGS)
  	$(POST)
  
  dep:
-@@ -113,9 +114,9 @@ clean:
+@@ -106,9 +107,9 @@ clean:
  	$(RM) mm$(E)
  
  install::