CVS commit: pkgsrc/news/multimail

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri May 14 12:15:02 UTC 2021

Modified Files:
        pkgsrc/news/multimail: Makefile
Added Files:
        pkgsrc/news/multimail/patches: patch-Makefile

Log Message:
multimail: add patch properly


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/news/multimail/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/news/multimail/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/news/multimail/Makefile
diff -u pkgsrc/news/multimail/Makefile:1.1 pkgsrc/news/multimail/Makefile:1.2
--- pkgsrc/news/multimail/Makefile:1.1  Thu Aug  6 12:50:28 2020
+++ pkgsrc/news/multimail/Makefile      Fri May 14 12:15:02 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/08/06 12:50:28 fcambus Exp $
+# $NetBSD: Makefile,v 1.2 2021/05/14 12:15:02 nia Exp $
 
 DISTNAME=      mmail-0.52
 CATEGORIES=    news
@@ -15,12 +15,6 @@ DEPENDS+=    unzip-[0-9]*:../../archivers/u
 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:

Added files:

Index: pkgsrc/news/multimail/patches/patch-Makefile
diff -u /dev/null pkgsrc/news/multimail/patches/patch-Makefile:1.1
--- /dev/null   Fri May 14 12:15:02 2021
+++ pkgsrc/news/multimail/patches/patch-Makefile        Fri May 14 12:15:02 2021
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile,v 1.1 2021/05/14 12:15:02 nia Exp $
+
+Honor CXXFLAGS, LDFLAGS.
+
+--- 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
+ 
+@@ -94,7 +94,7 @@ $(IOBJS) : %.o: $(isrc)/%.cc
+       $(CXX) $(OPTS) -I$(CURS_DIR) -c $<
+ 
+ mm$(E):       $(MOBJS) $(IOBJS)
+-      $(CXX) -o mm$(E) $(MOBJS) $(IOBJS) $(LIBS)
++      $(CXX) $(LDFLAGS) -o mm$(E) $(MOBJS) $(IOBJS) $(LIBS)
+       $(POST)
+ 
+ dep: