Fri May 7 07:08:39 2021 UTC ()
editline: Update to 20210419-3.1. PR pkg/56151

While here, clean up options handling.

   * See also NetBSD changelog:
	http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit

2021-04-19 Jess Thrysoee

   * version-info: 0:65:0

   * all: sync with upstream source

   * src/getline.c,src/sys.h: Provide getline.c implementation if not available
	Patch by Claes N辰st辿n

   * src/makelist: Use Posix locale; mainly to get ASCII character classes in e.g. `tr`
	Patch by Claes N辰st辿n

  * examples/test_filecompletion.c, examples/wtc1.c: err.h not supported by
  Solaris

2021-02-16 Jess Thrysoee

   * version-info: 0:64:0

   * all: sync with upstream source


(nia)
diff -r1.11 -r1.12 pkgsrc/devel/editline/Makefile
diff -r1.13 -r1.14 pkgsrc/devel/editline/distinfo
diff -r0 -r1.1 pkgsrc/devel/editline/options.mk
cvs diff -r1.11 -r1.12 pkgsrc/devel/editline/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/editline/Makefile 2020/05/11 20:52:45 1.11
+++ pkgsrc/devel/editline/Makefile 2021/05/07 07:08:39 1.12
@@ -1,48 +1,32 @@ @@ -1,48 +1,32 @@
1# $NetBSD: Makefile,v 1.11 2020/05/11 20:52:45 tnn Exp $ 1# $NetBSD: Makefile,v 1.12 2021/05/07 07:08:39 nia Exp $
2# 2#
3 3
4DISTNAME= libedit-20191231-3.1 4DISTNAME= libedit-20210419-3.1
5PKGNAME= editline-3.1.20191231 5PKGNAME= editline-3.1.20210419
6PKGREVISION= 2 
7CATEGORIES= devel 6CATEGORIES= devel
8MASTER_SITES= http://thrysoee.dk/editline/ 7MASTER_SITES= https://thrysoee.dk/editline/
9 8
10MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://www.thrysoee.dk/editline/ 10HOMEPAGE= https://thrysoee.dk/editline/
12COMMENT= NetBSD Editline library (libedit) for generic line editing 11COMMENT= NetBSD Editline library (libedit) for generic line editing
13LICENSE= modified-bsd 12LICENSE= modified-bsd
14 13
15PKGCONFIG_OVERRIDE+= libedit.pc.in 14PKGCONFIG_OVERRIDE+= libedit.pc.in
16 15
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
20USE_TOOLS+= automake autoreconf 19USE_TOOLS+= automake autoreconf
21CONFIGURE_ARGS+= --enable-widec 20CONFIGURE_ARGS+= --enable-widec
22 21
23.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
24 23
25pre-configure: 24pre-configure:
26.if ${OPSYS} == "SunOS" && !exists(/usr/include/err.h) 25.if ${OPSYS} == "SunOS" && !exists(/usr/include/err.h)
27 ${CP} ${FILESDIR}/err.h ${BUILDLINK_DIR}/include 26 ${CP} ${FILESDIR}/err.h ${BUILDLINK_DIR}/include
28.endif 27.endif
29 cd ${WRKSRC} && autoreconf -fiv 28 cd ${WRKSRC} && autoreconf -fiv
30 29
31PKG_OPTIONS_VAR= PKG_OPTIONS.editline 30.include "options.mk"
32PKG_SUPPORTED_OPTIONS+= doc 
33PKG_SUGGESTED_OPTIONS+= # empty; conflicts with devel/readline 
34 
35.include "../../mk/bsd.options.mk" 
36 
37PLIST_VARS+= doc 
38.if !empty(PKG_OPTIONS:Mdoc) 
39PLIST.doc= yes 
40.endif 
41 
42post-extract: 
43.if empty(PKG_OPTIONS:Mdoc) 
44 ${ECHO} "" > ${WRKSRC}/doc/Makefile.am 
45.endif 
46 
47.include "../../mk/termcap.buildlink3.mk" 31.include "../../mk/termcap.buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/devel/editline/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/editline/distinfo 2020/05/11 20:52:45 1.13
+++ pkgsrc/devel/editline/distinfo 2021/05/07 07:08:39 1.14
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.13 2020/05/11 20:52:45 tnn Exp $ 1$NetBSD: distinfo,v 1.14 2021/05/07 07:08:39 nia Exp $
2 2
3SHA1 (libedit-20191231-3.1.tar.gz) = 44891b6ceb0429fec0a118a1245c605410571d7d 3SHA1 (libedit-20210419-3.1.tar.gz) = 325c7655d0ede2f9a139b5ed07b65b70c97794b0
4RMD160 (libedit-20191231-3.1.tar.gz) = a0e32d4bbb896b6f7e6567902e4205f2e435cd26 4RMD160 (libedit-20210419-3.1.tar.gz) = 1c1736960c0155e3b1230602deda62e1758cc825
5SHA512 (libedit-20191231-3.1.tar.gz) = 1df2eced98e8db1bb0af940678c154d87e3b11dd21e65a903682367f5feace5112f9a543b8e0cb04bbfeaaf73729f808db2d9c302637fc063e81c0a37777ac2c 5SHA512 (libedit-20210419-3.1.tar.gz) = d5e2cdad18d17fb94e839d02b7b7437378bb85986478d4c95e4105a6ac47fcbbd6bdd0a20a83d23455ed9cb1e178d6c0acbe63f4559096afd506f283c2cc00e9
6Size (libedit-20191231-3.1.tar.gz) = 516801 bytes 6Size (libedit-20210419-3.1.tar.gz) = 522387 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-libedit.pc.in) = c2c810ab2c9c7b9d1862abc7bdca53fda5732119
11SHA1 (patch-src_sys.h) = 3c1f69b520b382e3a0308e7f8ffaddca65d91a8d 11SHA1 (patch-src_sys.h) = 3c1f69b520b382e3a0308e7f8ffaddca65d91a8d
12SHA1 (patch-src_terminal.h) = 5d658f7b7c3b88c0c3122a1be740f3a72d7d2370 12SHA1 (patch-src_terminal.h) = 5d658f7b7c3b88c0c3122a1be740f3a72d7d2370
File Added: pkgsrc/devel/editline/Attic/options.mk
# $NetBSD: options.mk,v 1.1 2021/05/07 07:08:39 nia Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.editline
PKG_SUPPORTED_OPTIONS+=	doc
PKG_SUGGESTED_OPTIONS+=	# empty; conflicts with devel/readline

.include "../../mk/bsd.options.mk"

PLIST_VARS+=	doc
.if !empty(PKG_OPTIONS:Mdoc)
PLIST.doc=	yes
.else
.  if empty(PKG_OPTIONS:Mdoc)
editline-remove-docs:
	${ECHO} "" > ${WRKSRC}/doc/Makefile.am

post-extract: editline-remove-docs
.  endif
.endif