CVS commit: pkgsrc/devel/editline

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jun 26 11:37:08 UTC 2023

Modified Files:
        pkgsrc/devel/editline: Makefile PLIST buildlink3.mk builtin.mk distinfo
Removed Files:
        pkgsrc/devel/editline/patches: patch-Makefile.am

Log Message:
editline: update to 3.1.20221030.

2022-10-30 Jess Thrysoee

   * src/sys.h, src/reallocarr.c: Remove unused sys/cdefs.h include, to compile against musl libc
        Reported by Matt Boehlke

   * version-info: 0:70:0

2022-10-09 Jess Thrysoee

   * version-info: 0:69:0

   * src/sys.h: Add __sun guard around sys/types.h in sys.h

   * all: sync with upstream source

2021-09-10 Jess Thrysoee

   * all: sync with upstream source

2021-07-14 Jess Thrysoee

   * all: sync with upstream source

   * src/histedit.h: Add wcsdup declaration when ifndef HAVE_WCSDUP. Patch by Rainer Jung.

   * examples/wtc1.c: Fix warnings and add missing brace. Patch by Rainer Jung.

2021-05-22 Jess Thrysoee

   * version-info: 0:66:0

   * all: sync with upstream source

   * src/el.c: editrc not read on systems without issetugid
        Patch by Trevor Cordes


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/editline/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/editline/PLIST \
    pkgsrc/devel/editline/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/editline/builtin.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/editline/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/editline/patches/patch-Makefile.am

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.13 pkgsrc/devel/editline/Makefile:1.14
--- pkgsrc/devel/editline/Makefile:1.13 Fri May  7 07:13:28 2021
+++ pkgsrc/devel/editline/Makefile      Mon Jun 26 11:37:07 2023
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2021/05/07 07:13:28 nia Exp $
-#
+# $NetBSD: Makefile,v 1.14 2023/06/26 11:37:07 wiz Exp $
 
-DISTNAME=              libedit-20210419-3.1
-PKGNAME=               editline-3.1.20210419
-PKGREVISION=           1
+DISTNAME=              libedit-20221030-3.1
+PKGNAME=               editline-3.1.20221030
 CATEGORIES=            devel
 MASTER_SITES=          https://thrysoee.dk/editline/
 
@@ -17,12 +15,12 @@ PKGCONFIG_OVERRIDE+=        libedit.pc.in
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
-USE_TOOLS+=            automake autoreconf
-CONFIGURE_ARGS+=       --enable-widec
 
 post-install:
        # Avoid conflict with devel/readline.
-       ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/history.3
+       cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3 && ${MV} history.3 editline-history.3
+       # Install symlink like NetBSD base system has
+       cd ${DESTDIR}${PREFIX}/include/editline && ln -sf readline.h history.h
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -30,7 +28,6 @@ pre-configure:
 .if ${OPSYS} == "SunOS" && !exists(/usr/include/err.h)
        ${CP} ${FILESDIR}/err.h ${BUILDLINK_DIR}/include
 .endif
-       cd ${WRKSRC} && autoreconf -fiv
 
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/editline/PLIST
diff -u pkgsrc/devel/editline/PLIST:1.5 pkgsrc/devel/editline/PLIST:1.6
--- pkgsrc/devel/editline/PLIST:1.5     Fri May  7 07:13:28 2021
+++ pkgsrc/devel/editline/PLIST Mon Jun 26 11:37:07 2023
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2021/05/07 07:13:28 nia Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/06/26 11:37:07 wiz Exp $
 include/editline/history.h
 include/editline/readline.h
 include/histedit.h
 lib/libedit.la
 lib/pkgconfig/libedit.pc
+man/man3/editline-history.3
 man/man3/editline.3
 man/man3/el_deletestr.3
 man/man3/el_end.3
Index: pkgsrc/devel/editline/buildlink3.mk
diff -u pkgsrc/devel/editline/buildlink3.mk:1.5 pkgsrc/devel/editline/buildlink3.mk:1.6
--- pkgsrc/devel/editline/buildlink3.mk:1.5     Mon May 11 21:06:01 2020
+++ pkgsrc/devel/editline/buildlink3.mk Mon Jun 26 11:37:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/05/11 21:06:01 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2023/06/26 11:37:07 wiz Exp $
 
 BUILDLINK_TREE+=       editline
 
@@ -20,7 +20,7 @@ CHECK_BUILTIN.editline:=      yes
 CHECK_BUILTIN.editline:=       no
 
 # A built-in editline is always going to use a built-in termcap.
-.if !empty(USE_BUILTIN.editline:M[yY][eE][sS])
+.if ${USE_BUILTIN.editline:U:tl} == yes
 USE_BUILTIN.termcap=   yes
 .endif
 

Index: pkgsrc/devel/editline/builtin.mk
diff -u pkgsrc/devel/editline/builtin.mk:1.9 pkgsrc/devel/editline/builtin.mk:1.10
--- pkgsrc/devel/editline/builtin.mk:1.9        Sun Nov  3 10:39:10 2019
+++ pkgsrc/devel/editline/builtin.mk    Mon Jun 26 11:37:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2019/11/03 10:39:10 rillig Exp $
+# $NetBSD: builtin.mk,v 1.10 2023/06/26 11:37:07 wiz Exp $
 
 BUILTIN_PKG:=  editline
 
@@ -15,8 +15,8 @@ BUILTIN_FIND_HEADERS.H_EDITLINE=      editlin
 ###
 .if !defined(IS_BUILTIN.editline)
 IS_BUILTIN.editline=   no
-.  if empty(H_EDITLINE:M__nonexistent__) && \
-      !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
+.  if ${H_EDITLINE:U} != __nonexistent__ && \
+      ${BUILTIN_LIB_FOUND.edit:U:tl} == yes
 IS_BUILTIN.editline=   yes
 .  endif
 .endif
@@ -32,7 +32,7 @@ USE_BUILTIN.editline= no
 .  else
 USE_BUILTIN.editline=  ${IS_BUILTIN.editline}
 .    if defined(BUILTIN_PKG.editline) && \
-        !empty(IS_BUILTIN.editline:M[yY][eE][sS])
+        ${IS_BUILTIN.editline:tl} == yes
 USE_BUILTIN.editline=  yes
 .    endif
 MAKEVARS+=             USE_BUILTIN.editline
@@ -40,14 +40,14 @@ MAKEVARS+=          USE_BUILTIN.editline
 .endif
 
 CHECK_BUILTIN.editline?=       no
-.if !empty(CHECK_BUILTIN.editline:M[nN][oO])
+.if ${CHECK_BUILTIN.editline:tl} == no
 
 .  if !empty(_PKG_USE_READLINE:U:M[yY][eE][sS])
 BUILDLINK_TRANSFORM+=  l:history:edit:${BUILTIN_LIBNAME.termcap}
 BUILDLINK_TRANSFORM+=  l:readline:edit:${BUILTIN_LIBNAME.termcap}
 .  endif
 
-.  if !empty(USE_BUILTIN.editline:M[yY][eE][sS])
+.  if ${USE_BUILTIN.editline:tl} == yes
 .    if !empty(H_EDITLINE:M*/editline/readline.h)
 BUILDLINK_TARGETS+=    buildlink-readline-readline-h
 BUILDLINK_TARGETS+=    buildlink-readline-history-h

Index: pkgsrc/devel/editline/distinfo
diff -u pkgsrc/devel/editline/distinfo:1.16 pkgsrc/devel/editline/distinfo:1.17
--- pkgsrc/devel/editline/distinfo:1.16 Tue Oct 26 10:14:34 2021
+++ pkgsrc/devel/editline/distinfo      Mon Jun 26 11:37:07 2023
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:14:34 nia Exp $
+$NetBSD: distinfo,v 1.17 2023/06/26 11:37:07 wiz Exp $
 
-BLAKE2s (libedit-20210419-3.1.tar.gz) = da6768f2661deb8cdcdc3baa4985d847aa5dd74d5822771bd108c6c269cdf4f0
-SHA512 (libedit-20210419-3.1.tar.gz) = d5e2cdad18d17fb94e839d02b7b7437378bb85986478d4c95e4105a6ac47fcbbd6bdd0a20a83d23455ed9cb1e178d6c0acbe63f4559096afd506f283c2cc00e9
-Size (libedit-20210419-3.1.tar.gz) = 522387 bytes
-SHA1 (patch-Makefile.am) = c9c49476fcff0da3363874795fcf4b6ebd0f59de
+BLAKE2s (libedit-20221030-3.1.tar.gz) = 28971f0b4661c9b400df3cfe8d82e6ef4cf7bc9a964a013671adf560aeec9488
+SHA512 (libedit-20221030-3.1.tar.gz) = 41eb46feaffa909e8790b9a9e304d5246e82ab366721196126a923d68b4d4964d0a433fe238f9d5e0a00aefb5c8cb66132150792929a793785ad091d91016f97
+Size (libedit-20221030-3.1.tar.gz) = 533261 bytes
 SHA1 (patch-ab) = 18297f76965ecd56834c94f6c9f780d3e05a44d8
 SHA1 (patch-ac) = 666403d5ef03fea39081d7a657aefaa91746f788
 SHA1 (patch-libedit.pc.in) = c2c810ab2c9c7b9d1862abc7bdca53fda5732119