pkgsrc-WIP-changes archive

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

ee: don't require pkg-config.



Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Thu Dec 1 11:44:57 2022 +0100
Changeset:	27c5231e89365020ee2810689028486b6f0107f3

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

Log Message:
ee: don't require pkg-config.

Fix typo in patch description.

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

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

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

diffs:
diff --git a/ee/Makefile b/ee/Makefile
index cd36d38937..48ff3ff07a 100644
--- a/ee/Makefile
+++ b/ee/Makefile
@@ -12,14 +12,10 @@ HOMEPAGE=	https://www.ucl.ac.uk/~ccaabaa/is/unix/ee.htm
 COMMENT=	EasyEdit, a classic curses text editor
 LICENSE=	2-clause-bsd
 
-USE_TOOLS+=	pkg-config
 USE_NCURSES=	yes     # fixterm()
 
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths+=	create.make
-SUBST_VARS.paths=	PREFIX
-SUBST_MESSAGE.paths=	Setting default pkg-config's path.
+MAKE_FLAGS+=	NCURSES_CFLAGS=-I${BUILDLINK_PREFIX.ncurses}/include
+MAKE_FLAGS+=	NCURSES_LDFLAGS=-L${BUILDLINK_PREFIX.ncurses}/lib
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/ee/distinfo b/ee/distinfo
index 3c18771dd5..555f5b6ab8 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) = 2e142087d3a8a2b8bb204de6bd69fe0b8995e130
+SHA1 (patch-create.make) = af2b0acae9abb1f5aec900c6bcee1c14371d3af3
 SHA1 (patch-ee.c) = 9da740c0bf6720c8b44839a6037d9cdbd7b3ba52
diff --git a/ee/patches/patch-create.make b/ee/patches/patch-create.make
index 8cb2e8f2a5..1040dee367 100644
--- a/ee/patches/patch-create.make
+++ b/ee/patches/patch-create.make
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Use local ncurses rather then ee's own implementation.
+Use local ncurses rather than ee's own implementation.
 
 --- create.make.orig	2002-09-23 04:18:30.000000000 +0000
 +++ create.make
@@ -56,7 +56,7 @@ Use local ncurses rather then ee's own implementation.
  
  curses :	ee.c
 -	cc ee.c -o ee \$(CFLAGS) -lcurses 
-+	cc ee.c -o ee \$(CFLAGS) `@PREFIX@/bin/pkg-config --cflags --libs ncurses`
++	cc ee.c -o ee \$(CFLAGS) \$(NCURSES_CFLAGS) \$(NCURSES_LDFLAGS) -lncurses
  
  ee :	ee.o new_curse.o
  	cc -o ee ee.o new_curse.o \$(CFLAGS) 


Home | Main Index | Thread Index | Old Index