ee: simplify linking against ncurses.

[Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Thu Dec 1 12:40:27 2022 +0100
Changeset:	32ca453b2c047c5d479939db8467ac4d3da64989

Modified Files:
	ee/Makefile
	ee/distinfo
	ee/patches/patch-create.make

Log Message:
ee: simplify linking against ncurses.

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

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

diffstat:
 ee/Makefile                  |  4 ++--
 ee/distinfo                  |  2 +-
 ee/patches/patch-create.make | 12 ++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diffs:
diff --git a/ee/Makefile b/ee/Makefile
index 48ff3ff07a..15ccc0c8a1 100644
--- a/ee/Makefile
+++ b/ee/Makefile
@@ -14,8 +14,8 @@ LICENSE=	2-clause-bsd
 
 USE_NCURSES=	yes     # fixterm()
 
-MAKE_FLAGS+=	NCURSES_CFLAGS=-I${BUILDLINK_PREFIX.ncurses}/include
-MAKE_FLAGS+=	NCURSES_LDFLAGS=-L${BUILDLINK_PREFIX.ncurses}/lib
+MAKE_ENV+=	CFLAGS=${CFLAGS:Q}
+MAKE_ENV+=	LDFLAGS=${LDFLAGS:Q}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/ee/distinfo b/ee/distinfo
index 555f5b6ab8..abe3d56f8e 100644
--- a/ee/distinfo
+++ b/ee/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
 BLAKE2s (ee-1.5.2/ee-1.5.2.src.tgz) = a8be0743e80ab053ff72e238da2ce66ed80bc494f1aa066cb50eb57ab5a9faf9
 SHA512 (ee-1.5.2/ee-1.5.2.src.tgz) = 9ca0e82d65971b0bce38e09c365b6eb8b81ca6ff5b244107ae254322e47e841e7f5345bf242a0a9dd66b731d46cead6f442016b9e070a1298e1a5319b1d7b97a
 Size (ee-1.5.2/ee-1.5.2.src.tgz) = 69651 bytes
-SHA1 (patch-create.make) = af2b0acae9abb1f5aec900c6bcee1c14371d3af3
+SHA1 (patch-create.make) = dadc80a68d4bd3b31d1eaa869da065d33a2bb360
 SHA1 (patch-ee.c) = 9da740c0bf6720c8b44839a6037d9cdbd7b3ba52
diff --git a/ee/patches/patch-create.make b/ee/patches/patch-create.make
index 1040dee367..6783d58ffd 100644
--- a/ee/patches/patch-create.make
+++ b/ee/patches/patch-create.make
@@ -51,12 +51,20 @@ Use local ncurses rather than ee's own implementation.
  fi
  
  # check if this is a SunOS system
-@@ -267,7 +240,7 @@ echo "all :	$TARGET" >> make.local
+@@ -261,13 +234,15 @@ echo "DEFINES =	$termio $terminfo_exists
+ echo "" >> make.local
+ echo "CFLAGS =	$HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $five_lib $five_include $select_hdr $other_cflags $termcap_exists" >> make.local
+ echo "" >> make.local
++echo "LDFLAGS =	$LDFLAGS" >> make.local
++echo "" >> make.local
+ echo "" >> make.local
+ echo "all :	$TARGET" >> make.local
+ 
  cat  >> make.local << EOF
  
  curses :	ee.c
 -	cc ee.c -o ee \$(CFLAGS) -lcurses 
-+	cc ee.c -o ee \$(CFLAGS) \$(NCURSES_CFLAGS) \$(NCURSES_LDFLAGS) -lncurses
++	cc ee.c -o ee \$(CFLAGS) \$(CFLAGS) \$(LDFLAGS) -lncurses
  
  ee :	ee.o new_curse.o
  	cc -o ee ee.o new_curse.o \$(CFLAGS)