pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

swi-prolog-packages: Add a kludge to force just readline (no editline)



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Sep 25 00:22:31 2018 +0200
Changeset:	80905c8be829459a9c6e473935e318d8e50654dd

Modified Files:
	swi-prolog-packages/Makefile
	swi-prolog-packages/PLIST

Log Message:
swi-prolog-packages: Add a kludge to force just readline (no editline)

editline bindings does not support completion and if present they
will be preferred and hence no completion will be available in the
REPL.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=80905c8be829459a9c6e473935e318d8e50654dd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 swi-prolog-packages/Makefile | 6 +++++-
 swi-prolog-packages/PLIST    | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs:
diff --git a/swi-prolog-packages/Makefile b/swi-prolog-packages/Makefile
index 2210eb75c8..762d4dad4b 100644
--- a/swi-prolog-packages/Makefile
+++ b/swi-prolog-packages/Makefile
@@ -67,10 +67,15 @@ DISPLAY= :2
 
 MAKE_ENV+=		DISPLAY=${DISPLAY:Q}
 
+# XXX: editline bindings seems limited and does not support completion, remove
+# XXX: them in order to always use readline.pl.
 post-install: teardownx
+	${RM} ${DESTDIR}${PREFIX}/lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/libedit4pl.so || ${TRUE}
+	${RM} ${DESTDIR}${PREFIX}/lib/swi-prolog-${PKGVERSION}/library/editline.pl || ${TRUE}
 	${RM} -f ${LOCALBASE}/lib/swi-prolog-${SWIPLVERS}/xpce-${XPCE_VERSION}/prolog/lib/.pwd
 	${INSTALL_DATA} ${WRKSRC}/packages/xpce/man/xpce-client.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xpce-client.1
 	${INSTALL_DATA} ${WRKSRC}/packages/xpce/man/xpce.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xpce.1
+
 teardownx:
 	${ECHO} teardownx: Xvfb-PID: `${CAT} ${WRKDIR}/.Xvfb.pid`
 	sleep 5
@@ -87,7 +92,6 @@ CHECK_WRKREF_SKIP=	lib/swi-prolog-${SWIPLVERS}/xpce-${XPCE_VERSION}/lib/${MACHIN
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/ossp-uuid/buildlink3.mk"
-# uses rl_event_hook() interface
 .include "../../devel/readline/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
diff --git a/swi-prolog-packages/PLIST b/swi-prolog-packages/PLIST
index 6099a22d8b..aa360359ea 100644
--- a/swi-prolog-packages/PLIST
+++ b/swi-prolog-packages/PLIST
@@ -12,7 +12,6 @@ lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/hashstream.so
 lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/http_stream.so
 lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/isub.so
 lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/json.so
-lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/libedit4pl.so
 lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/md54pl.so
 lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/memfile.so
 lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/ntriples.so
@@ -112,7 +111,6 @@ lib/swi-prolog-${PKGVERSION}/library/doc_files.pl
 lib/swi-prolog-${PKGVERSION}/library/doc_http.pl
 lib/swi-prolog-${PKGVERSION}/library/doc_latex.pl
 lib/swi-prolog-${PKGVERSION}/library/double_metaphone.pl
-lib/swi-prolog-${PKGVERSION}/library/editline.pl
 lib/swi-prolog-${PKGVERSION}/library/filesex.pl
 lib/swi-prolog-${PKGVERSION}/library/hash_stream.pl
 lib/swi-prolog-${PKGVERSION}/library/http/INDEX.pl


Home | Main Index | Thread Index | Old Index