Received: by mail.netbsd.org (Postfix, from userid 605) id 6F1A384DD4; Fri, 7 May 2021 07:13:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AA03484DB5 for ; Fri, 7 May 2021 07:13:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id mEzz_36Jky7R for ; Fri, 7 May 2021 07:13:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0F59384D98 for ; Fri, 7 May 2021 07:13:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 034B7FA95; Fri, 7 May 2021 07:13:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_162037160899490" MIME-Version: 1.0 Date: Fri, 7 May 2021 07:13:28 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/devel/editline To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210507071329.034B7FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_162037160899490 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri May 7 07:13:28 UTC 2021 Modified Files: pkgsrc/devel/editline: Makefile PLIST Removed Files: pkgsrc/devel/editline: options.mk Log Message: editline: fix conflict with devel/readline To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/editline/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/editline/PLIST cvs rdiff -u -r1.1 -r0 pkgsrc/devel/editline/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_162037160899490 Content-Disposition: inline Content-Length: 3843 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/editline/Makefile diff -u pkgsrc/devel/editline/Makefile:1.12 pkgsrc/devel/editline/Makefile:1.13 --- pkgsrc/devel/editline/Makefile:1.12 Fri May 7 07:08:39 2021 +++ pkgsrc/devel/editline/Makefile Fri May 7 07:13:28 2021 @@ -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_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 + .include "../../mk/bsd.prefs.mk" pre-configure: @@ -27,6 +32,5 @@ pre-configure: .endif cd ${WRKSRC} && autoreconf -fiv -.include "options.mk" .include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/editline/PLIST diff -u pkgsrc/devel/editline/PLIST:1.4 pkgsrc/devel/editline/PLIST:1.5 --- pkgsrc/devel/editline/PLIST:1.4 Mon Mar 23 09:27:34 2020 +++ pkgsrc/devel/editline/PLIST Fri May 7 07:13:28 2021 @@ -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 --_----------=_162037160899490--