pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

multimail: link against NetBSD curses instead of forcing ncursesw.



Module Name:	pkgsrc-wip
Committed By:	Frederic Cambus <fred%statdns.com@localhost>
Pushed By:	fcambus
Date:		Thu Sep 12 11:35:58 2019 +0200
Changeset:	f31a1b32eaf3a7213401bf70c027a06e9dfda65d

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

Log Message:
multimail: link against NetBSD curses instead of forcing ncursesw.

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

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

diffstat:
 multimail/Makefile               |  2 +-
 multimail/distinfo               |  2 +-
 multimail/patches/patch-Makefile | 20 +-------------------
 3 files changed, 3 insertions(+), 21 deletions(-)

diffs:
diff --git a/multimail/Makefile b/multimail/Makefile
index 0255bf43be..678ed7b15c 100644
--- a/multimail/Makefile
+++ b/multimail/Makefile
@@ -18,5 +18,5 @@ USE_TOOLS+=	gmake
 AUTO_MKDIRS=		yes
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
-.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimail/distinfo b/multimail/distinfo
index dc17ea1283..045019f1ea 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) = dcbee2769026575a51d00c82d8ae76c620b077f9
+SHA1 (patch-Makefile) = e98763d296b1868321f19dd31e830d92aadce1cf
diff --git a/multimail/patches/patch-Makefile b/multimail/patches/patch-Makefile
index ddb64ece2c..32a107f729 100644
--- a/multimail/patches/patch-Makefile
+++ b/multimail/patches/patch-Makefile
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Link against ncursesw, honour CXXFLAGS, and adapt install target for pkgsrc.
+Honour CXXFLAGS, and adapt install target for pkgsrc.
 
 --- Makefile.orig	2019-02-22 01:00:59.000000000 +0000
 +++ Makefile
@@ -22,24 +22,6 @@ Link against ncursesw, honour CXXFLAGS, and adapt install target for pkgsrc.
  
  #--------------------------------------------------------------
  # Defaults are for the standard curses setup:
-@@ -37,7 +38,7 @@ ifeq ($(OS),Windows_NT)
- 	E = .exe
- else
- 	CURS_DIR = .
--	LIBS = -lcurses
-+	LIBS = -lncursesw
- 	RM = rm -f
- 	SEP = ;
- 	E =
-@@ -94,7 +95,7 @@ $(IOBJS) : %.o: $(isrc)/%.cc
- 	$(CXX) $(OPTS) -I$(CURS_DIR) -c $<
- 
- mm$(E):	$(MOBJS) $(IOBJS)
--	$(CXX) -o mm$(E) $(MOBJS) $(IOBJS) $(LIBS)
-+	$(CXX) -o mm$(E) $(MOBJS) $(IOBJS) $(LIBS) $(LDFLAGS)
- 	$(POST)
- 
- dep:
 @@ -106,9 +107,9 @@ clean:
  	$(RM) mm$(E)
  


Home | Main Index | Thread Index | Old Index