Fri May 7 07:13:28 2021 UTC ()
editline: fix conflict with devel/readline


(nia)
diff -r1.12 -r1.13 pkgsrc/devel/editline/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/editline/PLIST
diff -r1.1 -r0 pkgsrc/devel/editline/options.mk
cvs diff -r1.12 -r1.13 pkgsrc/devel/editline/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/editline/Makefile 2021/05/07 07:08:39 1.12
+++ pkgsrc/devel/editline/Makefile 2021/05/07 07:13:28 1.13
@@ -1,32 +1,36 @@ @@ -1,32 +1,36 @@
1# $NetBSD: Makefile,v 1.12 2021/05/07 07:08:39 nia Exp $ 1# $NetBSD: Makefile,v 1.13 2021/05/07 07:13:28 nia Exp $
2# 2#
3 3
4DISTNAME= libedit-20210419-3.1 4DISTNAME= libedit-20210419-3.1
5PKGNAME= editline-3.1.20210419 5PKGNAME= editline-3.1.20210419
 6PKGREVISION= 1
6CATEGORIES= devel 7CATEGORIES= devel
7MASTER_SITES= https://thrysoee.dk/editline/ 8MASTER_SITES= https://thrysoee.dk/editline/
8 9
9MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= https://thrysoee.dk/editline/ 11HOMEPAGE= https://thrysoee.dk/editline/
11COMMENT= NetBSD Editline library (libedit) for generic line editing 12COMMENT= NetBSD Editline library (libedit) for generic line editing
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14PKGCONFIG_OVERRIDE+= libedit.pc.in 15PKGCONFIG_OVERRIDE+= libedit.pc.in
15 16
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
18USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
19USE_TOOLS+= automake autoreconf 20USE_TOOLS+= automake autoreconf
20CONFIGURE_ARGS+= --enable-widec 21CONFIGURE_ARGS+= --enable-widec
21 22
 23post-install:
 24 # Avoid conflict with devel/readline.
 25 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/history.3
 26
22.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
23 28
24pre-configure: 29pre-configure:
25.if ${OPSYS} == "SunOS" && !exists(/usr/include/err.h) 30.if ${OPSYS} == "SunOS" && !exists(/usr/include/err.h)
26 ${CP} ${FILESDIR}/err.h ${BUILDLINK_DIR}/include 31 ${CP} ${FILESDIR}/err.h ${BUILDLINK_DIR}/include
27.endif 32.endif
28 cd ${WRKSRC} && autoreconf -fiv 33 cd ${WRKSRC} && autoreconf -fiv
29 34
30.include "options.mk" 
31.include "../../mk/termcap.buildlink3.mk" 35.include "../../mk/termcap.buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/devel/editline/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/editline/PLIST 2020/03/23 09:27:34 1.4
+++ pkgsrc/devel/editline/PLIST 2021/05/07 07:13:28 1.5
@@ -1,49 +1,48 @@ @@ -1,49 +1,48 @@
1@comment $NetBSD: PLIST,v 1.4 2020/03/23 09:27:34 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.5 2021/05/07 07:13:28 nia Exp $
2include/editline/history.h 2include/editline/history.h
3include/editline/readline.h 3include/editline/readline.h
4include/histedit.h 4include/histedit.h
5lib/libedit.la 5lib/libedit.la
6lib/pkgconfig/libedit.pc 6lib/pkgconfig/libedit.pc
7${PLIST.doc}man/man3/editline.3 7man/man3/editline.3
8${PLIST.doc}man/man3/el_deletestr.3 8man/man3/el_deletestr.3
9${PLIST.doc}man/man3/el_end.3 9man/man3/el_end.3
10${PLIST.doc}man/man3/el_get.3 10man/man3/el_get.3
11${PLIST.doc}man/man3/el_getc.3 11man/man3/el_getc.3
12${PLIST.doc}man/man3/el_gets.3 12man/man3/el_gets.3
13${PLIST.doc}man/man3/el_init.3 13man/man3/el_init.3
14${PLIST.doc}man/man3/el_init_fd.3 14man/man3/el_init_fd.3
15${PLIST.doc}man/man3/el_insertstr.3 15man/man3/el_insertstr.3
16${PLIST.doc}man/man3/el_line.3 16man/man3/el_line.3
17${PLIST.doc}man/man3/el_parse.3 17man/man3/el_parse.3
18${PLIST.doc}man/man3/el_push.3 18man/man3/el_push.3
19${PLIST.doc}man/man3/el_reset.3 19man/man3/el_reset.3
20${PLIST.doc}man/man3/el_resize.3 20man/man3/el_resize.3
21${PLIST.doc}man/man3/el_set.3 21man/man3/el_set.3
22${PLIST.doc}man/man3/el_source.3 22man/man3/el_source.3
23${PLIST.doc}man/man3/el_wdeletestr.3 23man/man3/el_wdeletestr.3
24${PLIST.doc}man/man3/el_wget.3 24man/man3/el_wget.3
25${PLIST.doc}man/man3/el_wgetc.3 25man/man3/el_wgetc.3
26${PLIST.doc}man/man3/el_wgets.3 26man/man3/el_wgets.3
27${PLIST.doc}man/man3/el_winsertstr.3 27man/man3/el_winsertstr.3
28${PLIST.doc}man/man3/el_wline.3 28man/man3/el_wline.3
29${PLIST.doc}man/man3/el_wparse.3 29man/man3/el_wparse.3
30${PLIST.doc}man/man3/el_wpush.3 30man/man3/el_wpush.3
31${PLIST.doc}man/man3/el_wset.3 31man/man3/el_wset.3
32${PLIST.doc}man/man3/history.3 32man/man3/history_end.3
33${PLIST.doc}man/man3/history_end.3 33man/man3/history_init.3
34${PLIST.doc}man/man3/history_init.3 34man/man3/history_w.3
35${PLIST.doc}man/man3/history_w.3 35man/man3/history_wend.3
36${PLIST.doc}man/man3/history_wend.3 36man/man3/history_winit.3
37${PLIST.doc}man/man3/history_winit.3 37man/man3/tok_end.3
38${PLIST.doc}man/man3/tok_end.3 38man/man3/tok_init.3
39${PLIST.doc}man/man3/tok_init.3 39man/man3/tok_line.3
40${PLIST.doc}man/man3/tok_line.3 40man/man3/tok_reset.3
41${PLIST.doc}man/man3/tok_reset.3 41man/man3/tok_str.3
42${PLIST.doc}man/man3/tok_str.3 42man/man3/tok_wend.3
43${PLIST.doc}man/man3/tok_wend.3 43man/man3/tok_winit.3
44${PLIST.doc}man/man3/tok_winit.3 44man/man3/tok_wline.3
45${PLIST.doc}man/man3/tok_wline.3 45man/man3/tok_wreset.3
46${PLIST.doc}man/man3/tok_wreset.3 46man/man3/tok_wstr.3
47${PLIST.doc}man/man3/tok_wstr.3 47man/man5/editrc.5
48${PLIST.doc}man/man5/editrc.5 48man/man7/editline.7
49${PLIST.doc}man/man7/editline.7 
File Deleted: pkgsrc/devel/editline/Attic/options.mk