CVS commit: pkgsrc/devel/editline

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon May 11 20:52:45 UTC 2020

Modified Files:
        pkgsrc/devel/editline: Makefile distinfo
Added Files:
        pkgsrc/devel/editline/patches: patch-libedit.pc.in

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/editline/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/editline/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/editline/patches/patch-libedit.pc.in

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

Modified files:

Index: pkgsrc/devel/editline/Makefile
diff -u pkgsrc/devel/editline/Makefile:1.10 pkgsrc/devel/editline/Makefile:1.11
--- pkgsrc/devel/editline/Makefile:1.10 Mon Mar 23 09:34:27 2020
+++ pkgsrc/devel/editline/Makefile      Mon May 11 20:52:45 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2020/03/23 09:34:27 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2020/05/11 20:52:45 tnn Exp $
 #
 
 DISTNAME=              libedit-20191231-3.1
 PKGNAME=               editline-3.1.20191231
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            devel
 MASTER_SITES=          http://thrysoee.dk/editline/
 

Index: pkgsrc/devel/editline/distinfo
diff -u pkgsrc/devel/editline/distinfo:1.12 pkgsrc/devel/editline/distinfo:1.13
--- pkgsrc/devel/editline/distinfo:1.12 Wed May  6 20:55:38 2020
+++ pkgsrc/devel/editline/distinfo      Mon May 11 20:52:45 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2020/05/06 20:55:38 adam Exp $
+$NetBSD: distinfo,v 1.13 2020/05/11 20:52:45 tnn Exp $
 
 SHA1 (libedit-20191231-3.1.tar.gz) = 44891b6ceb0429fec0a118a1245c605410571d7d
 RMD160 (libedit-20191231-3.1.tar.gz) = a0e32d4bbb896b6f7e6567902e4205f2e435cd26
@@ -7,5 +7,6 @@ Size (libedit-20191231-3.1.tar.gz) = 516
 SHA1 (patch-Makefile.am) = c9c49476fcff0da3363874795fcf4b6ebd0f59de
 SHA1 (patch-ab) = 18297f76965ecd56834c94f6c9f780d3e05a44d8
 SHA1 (patch-ac) = 666403d5ef03fea39081d7a657aefaa91746f788
+SHA1 (patch-libedit.pc.in) = c2c810ab2c9c7b9d1862abc7bdca53fda5732119
 SHA1 (patch-src_sys.h) = 3c1f69b520b382e3a0308e7f8ffaddca65d91a8d
 SHA1 (patch-src_terminal.h) = 5d658f7b7c3b88c0c3122a1be740f3a72d7d2370

Added files:

Index: pkgsrc/devel/editline/patches/patch-libedit.pc.in
diff -u /dev/null pkgsrc/devel/editline/patches/patch-libedit.pc.in:1.1
--- /dev/null   Mon May 11 20:52:45 2020
+++ pkgsrc/devel/editline/patches/patch-libedit.pc.in   Mon May 11 20:52:45 2020
@@ -0,0 +1,13 @@
+$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
+