[pkgsrc/trunk]: pkgsrc/devel/editline editline: fix conflict with devel/readline

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b09339831f2a
branches:  trunk
changeset: 452219:b09339831f2a
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri May 07 07:13:28 2021 +0000

description:
editline: fix conflict with devel/readline

diffstat:

 devel/editline/Makefile   |   8 +++-
 devel/editline/PLIST      |  87 +++++++++++++++++++++++-----------------------
 devel/editline/options.mk |  19 ----------
 3 files changed, 49 insertions(+), 65 deletions(-)

diffs (151 lines):

diff -r 445414e9f671 -r b09339831f2a devel/editline/Makefile
--- a/devel/editline/Makefile   Fri May 07 07:08:39 2021 +0000
+++ b/devel/editline/Makefile   Fri May 07 07:13:28 2021 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2021/05/07 07:08:39 nia Exp $
+# $NetBSD: Makefile,v 1.13 2021/05/07 07:13:28 nia Exp $
 #
 
 DISTNAME=              libedit-20210419-3.1
 PKGNAME=               editline-3.1.20210419
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          https://thrysoee.dk/editline/
 
@@ -19,6 +20,10 @@
 USE_TOOLS+=            automake autoreconf
 CONFIGURE_ARGS+=       --enable-widec
 
+post-install:
+       # Avoid conflict with devel/readline.
+       ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/history.3
+
 .include "../../mk/bsd.prefs.mk"
 
 pre-configure:
@@ -27,6 +32,5 @@
 .endif
        cd ${WRKSRC} && autoreconf -fiv
 
-.include "options.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 445414e9f671 -r b09339831f2a devel/editline/PLIST
--- a/devel/editline/PLIST      Fri May 07 07:08:39 2021 +0000
+++ b/devel/editline/PLIST      Fri May 07 07:13:28 2021 +0000
@@ -1,49 +1,48 @@
-@comment $NetBSD: PLIST,v 1.4 2020/03/23 09:27:34 tnn Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/05/07 07:13:28 nia Exp $
 include/editline/history.h
 include/editline/readline.h
 include/histedit.h
 lib/libedit.la
 lib/pkgconfig/libedit.pc
-${PLIST.doc}man/man3/editline.3
-${PLIST.doc}man/man3/el_deletestr.3
-${PLIST.doc}man/man3/el_end.3
-${PLIST.doc}man/man3/el_get.3
-${PLIST.doc}man/man3/el_getc.3
-${PLIST.doc}man/man3/el_gets.3
-${PLIST.doc}man/man3/el_init.3
-${PLIST.doc}man/man3/el_init_fd.3
-${PLIST.doc}man/man3/el_insertstr.3
-${PLIST.doc}man/man3/el_line.3
-${PLIST.doc}man/man3/el_parse.3
-${PLIST.doc}man/man3/el_push.3
-${PLIST.doc}man/man3/el_reset.3
-${PLIST.doc}man/man3/el_resize.3
-${PLIST.doc}man/man3/el_set.3
-${PLIST.doc}man/man3/el_source.3
-${PLIST.doc}man/man3/el_wdeletestr.3
-${PLIST.doc}man/man3/el_wget.3
-${PLIST.doc}man/man3/el_wgetc.3
-${PLIST.doc}man/man3/el_wgets.3
-${PLIST.doc}man/man3/el_winsertstr.3
-${PLIST.doc}man/man3/el_wline.3
-${PLIST.doc}man/man3/el_wparse.3
-${PLIST.doc}man/man3/el_wpush.3
-${PLIST.doc}man/man3/el_wset.3
-${PLIST.doc}man/man3/history.3
-${PLIST.doc}man/man3/history_end.3
-${PLIST.doc}man/man3/history_init.3
-${PLIST.doc}man/man3/history_w.3
-${PLIST.doc}man/man3/history_wend.3
-${PLIST.doc}man/man3/history_winit.3
-${PLIST.doc}man/man3/tok_end.3
-${PLIST.doc}man/man3/tok_init.3
-${PLIST.doc}man/man3/tok_line.3
-${PLIST.doc}man/man3/tok_reset.3
-${PLIST.doc}man/man3/tok_str.3
-${PLIST.doc}man/man3/tok_wend.3
-${PLIST.doc}man/man3/tok_winit.3
-${PLIST.doc}man/man3/tok_wline.3
-${PLIST.doc}man/man3/tok_wreset.3
-${PLIST.doc}man/man3/tok_wstr.3
-${PLIST.doc}man/man5/editrc.5
-${PLIST.doc}man/man7/editline.7
+man/man3/editline.3
+man/man3/el_deletestr.3
+man/man3/el_end.3
+man/man3/el_get.3
+man/man3/el_getc.3
+man/man3/el_gets.3
+man/man3/el_init.3
+man/man3/el_init_fd.3
+man/man3/el_insertstr.3
+man/man3/el_line.3
+man/man3/el_parse.3
+man/man3/el_push.3
+man/man3/el_reset.3
+man/man3/el_resize.3
+man/man3/el_set.3
+man/man3/el_source.3
+man/man3/el_wdeletestr.3
+man/man3/el_wget.3
+man/man3/el_wgetc.3
+man/man3/el_wgets.3
+man/man3/el_winsertstr.3
+man/man3/el_wline.3
+man/man3/el_wparse.3
+man/man3/el_wpush.3
+man/man3/el_wset.3
+man/man3/history_end.3
+man/man3/history_init.3
+man/man3/history_w.3
+man/man3/history_wend.3
+man/man3/history_winit.3
+man/man3/tok_end.3
+man/man3/tok_init.3
+man/man3/tok_line.3
+man/man3/tok_reset.3
+man/man3/tok_str.3
+man/man3/tok_wend.3
+man/man3/tok_winit.3
+man/man3/tok_wline.3
+man/man3/tok_wreset.3
+man/man3/tok_wstr.3
+man/man5/editrc.5
+man/man7/editline.7
diff -r 445414e9f671 -r b09339831f2a devel/editline/options.mk
--- a/devel/editline/options.mk Fri May 07 07:08:39 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $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