Mon May 11 20:52:45 2020 UTC ()
editline: adjust libedit.pc file due to BUILDLINK_FNAME_TRANSFORM

We have questionable BUILDLINK_FNAME_TRANSFORMs in the bl3.mk that
transform include/editline/readline.h into include/readline/readline.h.

So if libedit.pc file says to use -I${PREFIX}/include/editline that
works fine when building stuff outside of pkgsrc but not inside of pkgsrc.

Workaround is to put both -I${PREFIX}/include/editline and
-I${PREFIX}/include/readline in the pc file, in that order of preference.


(tnn)
diff -r1.10 -r1.11 pkgsrc/devel/editline/Makefile
diff -r1.12 -r1.13 pkgsrc/devel/editline/distinfo
diff -r0 -r1.1 pkgsrc/devel/editline/patches/patch-libedit.pc.in
cvs diff -r1.10 -r1.11 pkgsrc/devel/editline/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/editline/Makefile 2020/03/23 09:34:27 1.10
+++ pkgsrc/devel/editline/Makefile 2020/05/11 20:52:45 1.11
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.10 2020/03/23 09:34:27 tnn Exp $ 1# $NetBSD: Makefile,v 1.11 2020/05/11 20:52:45 tnn Exp $
2# 2#
3 3
4DISTNAME= libedit-20191231-3.1 4DISTNAME= libedit-20191231-3.1
5PKGNAME= editline-3.1.20191231 5PKGNAME= editline-3.1.20191231
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= http://thrysoee.dk/editline/ 8MASTER_SITES= http://thrysoee.dk/editline/
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://www.thrysoee.dk/editline/ 11HOMEPAGE= https://www.thrysoee.dk/editline/
12COMMENT= NetBSD Editline library (libedit) for generic line editing 12COMMENT= NetBSD Editline library (libedit) for generic line editing
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15PKGCONFIG_OVERRIDE+= libedit.pc.in 15PKGCONFIG_OVERRIDE+= libedit.pc.in
16 16
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
cvs diff -r1.12 -r1.13 pkgsrc/devel/editline/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/editline/distinfo 2020/05/06 20:55:38 1.12
+++ pkgsrc/devel/editline/distinfo 2020/05/11 20:52:45 1.13
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.12 2020/05/06 20:55:38 adam Exp $ 1$NetBSD: distinfo,v 1.13 2020/05/11 20:52:45 tnn Exp $
2 2
3SHA1 (libedit-20191231-3.1.tar.gz) = 44891b6ceb0429fec0a118a1245c605410571d7d 3SHA1 (libedit-20191231-3.1.tar.gz) = 44891b6ceb0429fec0a118a1245c605410571d7d
4RMD160 (libedit-20191231-3.1.tar.gz) = a0e32d4bbb896b6f7e6567902e4205f2e435cd26 4RMD160 (libedit-20191231-3.1.tar.gz) = a0e32d4bbb896b6f7e6567902e4205f2e435cd26
5SHA512 (libedit-20191231-3.1.tar.gz) = 1df2eced98e8db1bb0af940678c154d87e3b11dd21e65a903682367f5feace5112f9a543b8e0cb04bbfeaaf73729f808db2d9c302637fc063e81c0a37777ac2c 5SHA512 (libedit-20191231-3.1.tar.gz) = 1df2eced98e8db1bb0af940678c154d87e3b11dd21e65a903682367f5feace5112f9a543b8e0cb04bbfeaaf73729f808db2d9c302637fc063e81c0a37777ac2c
6Size (libedit-20191231-3.1.tar.gz) = 516801 bytes 6Size (libedit-20191231-3.1.tar.gz) = 516801 bytes
7SHA1 (patch-Makefile.am) = c9c49476fcff0da3363874795fcf4b6ebd0f59de 7SHA1 (patch-Makefile.am) = c9c49476fcff0da3363874795fcf4b6ebd0f59de
8SHA1 (patch-ab) = 18297f76965ecd56834c94f6c9f780d3e05a44d8 8SHA1 (patch-ab) = 18297f76965ecd56834c94f6c9f780d3e05a44d8
9SHA1 (patch-ac) = 666403d5ef03fea39081d7a657aefaa91746f788 9SHA1 (patch-ac) = 666403d5ef03fea39081d7a657aefaa91746f788
 10SHA1 (patch-libedit.pc.in) = c2c810ab2c9c7b9d1862abc7bdca53fda5732119
10SHA1 (patch-src_sys.h) = 3c1f69b520b382e3a0308e7f8ffaddca65d91a8d 11SHA1 (patch-src_sys.h) = 3c1f69b520b382e3a0308e7f8ffaddca65d91a8d
11SHA1 (patch-src_terminal.h) = 5d658f7b7c3b88c0c3122a1be740f3a72d7d2370 12SHA1 (patch-src_terminal.h) = 5d658f7b7c3b88c0c3122a1be740f3a72d7d2370
File Added: pkgsrc/devel/editline/patches/patch-libedit.pc.in
$NetBSD: patch-libedit.pc.in,v 1.1 2020/05/11 20:52:45 tnn Exp $

Needed due to BUILDLINK_FNAME_TRANSFORM in bl3.mk.

--- libedit.pc.in.orig	2018-05-25 17:50:45.000000000 +0000
+++ libedit.pc.in
@@ -9,5 +9,5 @@ Version: @VERSION@
 Requires:
 Libs: -L${libdir} -ledit
 Libs.private: @LIBS@
-Cflags: -I${includedir} -I${includedir}/editline
+Cflags: -I${includedir} -I${includedir}/editline -I${includedir}/readline