CVS commit: pkgsrc/devel/editline

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri May  7 07:08:39 UTC 2021

Modified Files:
        pkgsrc/devel/editline: Makefile distinfo
Added Files:
        pkgsrc/devel/editline: options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/editline/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/editline/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/editline/options.mk

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.11 pkgsrc/devel/editline/Makefile:1.12
--- pkgsrc/devel/editline/Makefile:1.11 Mon May 11 20:52:45 2020
+++ pkgsrc/devel/editline/Makefile      Fri May  7 07:08:39 2021
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2020/05/11 20:52:45 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2021/05/07 07:08:39 nia Exp $
 #
 
-DISTNAME=              libedit-20191231-3.1
-PKGNAME=               editline-3.1.20191231
-PKGREVISION=           2
+DISTNAME=              libedit-20210419-3.1
+PKGNAME=               editline-3.1.20210419
 CATEGORIES=            devel
-MASTER_SITES=          http://thrysoee.dk/editline/
+MASTER_SITES=          https://thrysoee.dk/editline/
 
 MAINTAINER=            ryoon%NetBSD.org@localhost
-HOMEPAGE=              https://www.thrysoee.dk/editline/
+HOMEPAGE=              https://thrysoee.dk/editline/
 COMMENT=               NetBSD Editline library (libedit) for generic line editing
 LICENSE=               modified-bsd
 
@@ -28,21 +27,6 @@ pre-configure:
 .endif
        cd ${WRKSRC} && autoreconf -fiv
 
-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
-.endif
-
-post-extract:
-.if empty(PKG_OPTIONS:Mdoc)
-       ${ECHO} "" > ${WRKSRC}/doc/Makefile.am
-.endif
-
+.include "options.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/editline/distinfo
diff -u pkgsrc/devel/editline/distinfo:1.13 pkgsrc/devel/editline/distinfo:1.14
--- pkgsrc/devel/editline/distinfo:1.13 Mon May 11 20:52:45 2020
+++ pkgsrc/devel/editline/distinfo      Fri May  7 07:08:39 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2020/05/11 20:52:45 tnn Exp $
+$NetBSD: distinfo,v 1.14 2021/05/07 07:08:39 nia Exp $
 
-SHA1 (libedit-20191231-3.1.tar.gz) = 44891b6ceb0429fec0a118a1245c605410571d7d
-RMD160 (libedit-20191231-3.1.tar.gz) = a0e32d4bbb896b6f7e6567902e4205f2e435cd26
-SHA512 (libedit-20191231-3.1.tar.gz) = 1df2eced98e8db1bb0af940678c154d87e3b11dd21e65a903682367f5feace5112f9a543b8e0cb04bbfeaaf73729f808db2d9c302637fc063e81c0a37777ac2c
-Size (libedit-20191231-3.1.tar.gz) = 516801 bytes
+SHA1 (libedit-20210419-3.1.tar.gz) = 325c7655d0ede2f9a139b5ed07b65b70c97794b0
+RMD160 (libedit-20210419-3.1.tar.gz) = 1c1736960c0155e3b1230602deda62e1758cc825
+SHA512 (libedit-20210419-3.1.tar.gz) = d5e2cdad18d17fb94e839d02b7b7437378bb85986478d4c95e4105a6ac47fcbbd6bdd0a20a83d23455ed9cb1e178d6c0acbe63f4559096afd506f283c2cc00e9
+Size (libedit-20210419-3.1.tar.gz) = 522387 bytes
 SHA1 (patch-Makefile.am) = c9c49476fcff0da3363874795fcf4b6ebd0f59de
 SHA1 (patch-ab) = 18297f76965ecd56834c94f6c9f780d3e05a44d8
 SHA1 (patch-ac) = 666403d5ef03fea39081d7a657aefaa91746f788

Added files:

Index: pkgsrc/devel/editline/options.mk
diff -u /dev/null pkgsrc/devel/editline/options.mk:1.1
--- /dev/null   Fri May  7 07:08:39 2021
+++ pkgsrc/devel/editline/options.mk    Fri May  7 07:08:39 2021
@@ -0,0 +1,19 @@
+# $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