pkgsrc-WIP-changes archive

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

ee: minor fixes. - specify full path to pkg-config while generating the internal Makefile, to match pkgsrc's own version - change build target in package's Makefile (NFC).



Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Mon Aug 8 15:57:32 2022 +0200
Changeset:	58a3a8f19b723eae9e707fe2036f65614942a72f

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

Log Message:
ee: minor fixes.
- specify full path to pkg-config while generating the internal
  Makefile, to match pkgsrc's own version
- change build target in package's Makefile (NFC).

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

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

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

diffs:
diff --git a/ee/Makefile b/ee/Makefile
index 1a0f890426..2357f842da 100644
--- a/ee/Makefile
+++ b/ee/Makefile
@@ -15,11 +15,17 @@ 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.
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-WRKSRC=	${WRKDIR}/easyedit-1.5.2
+WRKSRC=	${WRKDIR}/easyedit-${PKGVERSION_NOREV}
 
-post-configure:
+do-build:
 	cd ${WRKSRC} && ${MAKE:Q} all
 
 do-install:
diff --git a/ee/distinfo b/ee/distinfo
index f6eb7a9bc0..3c18771dd5 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) = 86f4bce3998da808b11adfbd3934536b49f07081
+SHA1 (patch-create.make) = 2e142087d3a8a2b8bb204de6bd69fe0b8995e130
 SHA1 (patch-ee.c) = 9da740c0bf6720c8b44839a6037d9cdbd7b3ba52
diff --git a/ee/patches/patch-create.make b/ee/patches/patch-create.make
index 81ab343496..8cb2e8f2a5 100644
--- a/ee/patches/patch-create.make
+++ b/ee/patches/patch-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) `pkg-config --libs ncurses`
++	cc ee.c -o ee \$(CFLAGS) `@PREFIX@/bin/pkg-config --cflags --libs ncurses`
  
  ee :	ee.o new_curse.o
  	cc -o ee ee.o new_curse.o \$(CFLAGS) 


Home | Main Index | Thread Index | Old Index