PicoLisp: Make tests pass

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: PicoLisp: Make tests pass
From: Mateusz Poszwa <old4%o2.pl@localhost>
Date: Tue, 07 Mar 2017 21:29:14 +0000
Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Tue Mar 7 22:29:14 2017 +0100
Changeset:	4aefb2b42b07864d53fbf89e728a492b8614e9de

Modified Files:
	PicoLisp/Makefile
	PicoLisp/PLIST
	PicoLisp/TODO
	PicoLisp/distinfo
Added Files:
	PicoLisp/patches/patch-src_Makefile

Log Message:
PicoLisp: Make tests pass

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

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

diffstat:
 PicoLisp/Makefile                   | 27 +++++++++++++++++++++----
 PicoLisp/PLIST                      | 40 +++++++++++++++++++++++++++++++++++++
 PicoLisp/TODO                       |  1 +
 PicoLisp/distinfo                   |  1 +
 PicoLisp/patches/patch-src_Makefile | 13 ++++++++++++
 5 files changed, 78 insertions(+), 4 deletions(-)

diffs:
diff --git a/PicoLisp/Makefile b/PicoLisp/Makefile
index 84d6351ff7..5ab3c9a68a 100644
--- a/PicoLisp/Makefile
+++ b/PicoLisp/Makefile
@@ -28,12 +28,31 @@ SUBST_FILES.fix-paths+=		bin/pil
 SUBST_SED.fix-paths+=		-e 's,/usr/bin,${BIN_DIR},g'
 SUBST_SED.fix-paths+=		-e 's,/usr/lib,${LIB_DIR},g'
 
+SUBST_CLASSES+=			move-tests
+SUBST_STAGE.move-tests=		pre-install
+SUBST_MESSAGE.move-tests=	Fixing paths of moved tests.
+SUBST_FILES.move-tests+=	lib/test.l
+SUBST_FILES.move-tests+=	test/src/*.l
+SUBST_SED.move-tests=		-e 's,"@test,"${PREFIX}/tests/picolisp/test,g'
+
+do-test:
+	${WRKSRC}/bin/picolisp ${WRKSRC}/lib.l @lib/misc.l @lib/pilog.l @lib/test.l -bye +
+
 do-install:
 	${INSTALL_ENV} ${INSTALL_PROGRAM} ${WRKSRC}/bin/picolisp ${DESTDIR}${BIN_DIR}
 	${INSTALL_ENV} ${INSTALL_SCRIPT} ${WRKSRC}/bin/pil ${DESTDIR}${BIN_DIR}
-	${INSTALL_ENV} ${INSTALL_MAN} ${WRKSRC}/man/man1/picolisp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_ENV} ${INSTALL_MAN} ${WRKSRC}/man/man1/pil.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_ENV} ${INSTALL_SCRIPT} ${WRKSRC}/lib.l ${DESTDIR}${LIB_DIR}/picolisp
-	${INSTALL_ENV} ${INSTALL_SCRIPT} ${WRKSRC}/lib/*.l ${DESTDIR}${LIB_DIR}/picolisp/lib
+	${INSTALL_ENV} ${INSTALL_SCRIPT} ${WRKSRC}/lib.l ${DESTDIR}${LIB_DIR}/picolisp/
+	${INSTALL_ENV} ${INSTALL_SCRIPT} ${WRKSRC}/lib/*.l ${DESTDIR}${LIB_DIR}/picolisp/lib/
+	${INSTALL_ENV} ${INSTALL_SCRIPT} ${WRKSRC}/loc/*.l ${DESTDIR}${LIB_DIR}/picolisp/loc/
+	${INSTALL_ENV} ${INSTALL_DATA} ${WRKSRC}/loc/?? ${DESTDIR}${LIB_DIR}/picolisp/loc/
+	${INSTALL_ENV} ${INSTALL_LIB} ${WRKSRC}/lib/ext ${DESTDIR}${LIB_DIR}/picolisp/lib/
+	${INSTALL_ENV} ${INSTALL_LIB} ${WRKSRC}/lib/ht ${DESTDIR}${LIB_DIR}/picolisp/lib/
+	${INSTALL_ENV} ${INSTALL_DATA} ${WRKSRC}/lib/map ${DESTDIR}${LIB_DIR}/picolisp/lib/
+	${INSTALL_ENV} ${INSTALL_MAN} ${WRKSRC}/man/man1/picolisp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_ENV} ${INSTALL_MAN} ${WRKSRC}/man/man1/pil.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_ENV} ${INSTALL_SCRIPT} ${WRKSRC}/lib/test.l ${DESTDIR}${PREFIX}/tests/picolisp/lib/
+	${INSTALL_ENV} ${INSTALL_SCRIPT} ${WRKSRC}/test/lib.l ${DESTDIR}${PREFIX}/tests/picolisp/test/
+	${INSTALL_ENV} ${INSTALL_SCRIPT} ${WRKSRC}/test/lib/*.l ${DESTDIR}${PREFIX}/tests/picolisp/test/lib/
+	${INSTALL_ENV} ${INSTALL_SCRIPT} ${WRKSRC}/test/src/*.l ${DESTDIR}${PREFIX}/tests/picolisp/test/src/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/PicoLisp/PLIST b/PicoLisp/PLIST
index b6e4a1d9df..e1cfe88e76 100644
--- a/PicoLisp/PLIST
+++ b/PicoLisp/PLIST
@@ -17,16 +17,19 @@ lib/picolisp/lib/ed.l
 lib/picolisp/lib/edit.l
 lib/picolisp/lib/eedit.l
 lib/picolisp/lib/eled.l
+lib/picolisp/lib/ext
 lib/picolisp/lib/form.l
 lib/picolisp/lib/frac.l
 lib/picolisp/lib/gcc.l
 lib/picolisp/lib/heartbeat.l
+lib/picolisp/lib/ht
 lib/picolisp/lib/http.l
 lib/picolisp/lib/import.l
 lib/picolisp/lib/json.l
 lib/picolisp/lib/led.l
 lib/picolisp/lib/led.min.l
 lib/picolisp/lib/lint.l
+lib/picolisp/lib/map
 lib/picolisp/lib/math.l
 lib/picolisp/lib/math32.l
 lib/picolisp/lib/math64.l
@@ -56,5 +59,42 @@ lib/picolisp/lib/xml.l
 lib/picolisp/lib/xmlrpc.l
 lib/picolisp/lib/z3d.l
 lib/picolisp/lib/zahlwort.l
+lib/picolisp/loc/AR.l
+lib/picolisp/loc/CH.l
+lib/picolisp/loc/DE.l
+lib/picolisp/loc/ES.l
+lib/picolisp/loc/FR.l
+lib/picolisp/loc/JP.l
+lib/picolisp/loc/NIL.l
+lib/picolisp/loc/NO.l
+lib/picolisp/loc/RU.l
+lib/picolisp/loc/SE.l
+lib/picolisp/loc/UK.l
+lib/picolisp/loc/US.l
+lib/picolisp/loc/ar
+lib/picolisp/loc/ch
+lib/picolisp/loc/de
+lib/picolisp/loc/es
+lib/picolisp/loc/fr
+lib/picolisp/loc/jp
+lib/picolisp/loc/no
+lib/picolisp/loc/ru
+lib/picolisp/loc/sv
 man/man1/picolisp.1
 man/man1/pil.1
+tests/picolisp/lib/test.l
+tests/picolisp/test/lib.l
+tests/picolisp/test/lib/lint.l
+tests/picolisp/test/lib/math.l
+tests/picolisp/test/lib/misc.l
+tests/picolisp/test/src/apply.l
+tests/picolisp/test/src/big.l
+tests/picolisp/test/src/db.l
+tests/picolisp/test/src/ext.l
+tests/picolisp/test/src/flow.l
+tests/picolisp/test/src/ht.l
+tests/picolisp/test/src/io.l
+tests/picolisp/test/src/main.l
+tests/picolisp/test/src/net.l
+tests/picolisp/test/src/subr.l
+tests/picolisp/test/src/sym.l
diff --git a/PicoLisp/TODO b/PicoLisp/TODO
index 64f9570b48..ead6749b39 100644
--- a/PicoLisp/TODO
+++ b/PicoLisp/TODO
@@ -1 +1,2 @@
 Install more files
+Don’t install lib/test.l twice
diff --git a/PicoLisp/distinfo b/PicoLisp/distinfo
index 2305284544..d5731d6a29 100644
--- a/PicoLisp/distinfo
+++ b/PicoLisp/distinfo
@@ -4,3 +4,4 @@ SHA1 (picoLisp.tgz) = 9464d84f56a9236b34c520b29d00e80497d61709
 RMD160 (picoLisp.tgz) = bd1dd41317aaf76ff0178e9cfd335ab4d04e2e59
 SHA512 (picoLisp.tgz) = a0d2bba345816a174d659ab222cd099d8fd8538d298b9baaa37ba929855d49b6b18a751c9120afb1a35d71ec858e1687e12efe0595261393c16a13e53c257ba9
 Size (picoLisp.tgz) = 984138 bytes
+SHA1 (patch-src_Makefile) = fe320943e1660063e3c916d958eb2161c22d86f1
diff --git a/PicoLisp/patches/patch-src_Makefile b/PicoLisp/patches/patch-src_Makefile
new file mode 100644
index 0000000000..35374c5312
--- /dev/null
+++ b/PicoLisp/patches/patch-src_Makefile
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/Makefile.orig	2016-02-02 15:52:49.000000000 +0000
++++ src/Makefile
+@@ -48,7 +48,7 @@ ifeq ($(shell uname), FreeBSD)
+ else
+ ifeq ($(shell uname), NetBSD)
+ 	OS = NetBSD
+-	CFLAGS += -m32
++	CFLAGS += -m32 -fpic
+ 	PICOLISP-FLAGS = -m32 -rdynamic
+ 	LIB-FLAGS = -lm
+ 	DYNAMIC-LIB-FLAGS = -m32 -shared -export-dynamic
Prev by Date: update to 0.14.24
Next by Date: translate-toolkit: use recently added textproc/py-Levenshtein instead of warning the user to install via pip.
Previous by Thread: update to 0.14.24
Next by Thread: translate-toolkit: use recently added textproc/py-Levenshtein instead of warning the user to install via pip.
Indexes:
Home | Main Index | Thread Index | Old Index