pkgsrc-WIP-changes archive

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

wip/picolisp{,64}: Upgrade to v19.12



Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Mon Jun 22 19:11:10 2020 +0200
Changeset:	869594f39a11349dfbe0fab046329e114d92cd68

Modified Files:
	picolisp/Makefile.common
	picolisp/PLIST
	picolisp/distinfo
	picolisp/patches/patch-src_Makefile
	picolisp64/PLIST
	picolisp64/distinfo
	picolisp64/patches/patch-src64_Makefile
	picolisp64/patches/patch-src_Makefile

Log Message:
wip/picolisp{,64}: Upgrade to v19.12

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

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

diffstat:
 picolisp/Makefile.common                |  2 +-
 picolisp/PLIST                          | 10 +++--
 picolisp/distinfo                       | 10 ++---
 picolisp/patches/patch-src_Makefile     | 14 ++++---
 picolisp64/PLIST                        | 10 +++--
 picolisp64/distinfo                     | 12 +++---
 picolisp64/patches/patch-src64_Makefile | 72 ++++++++++++++++-----------------
 picolisp64/patches/patch-src_Makefile   | 14 ++++---
 8 files changed, 78 insertions(+), 66 deletions(-)

diffs:
diff --git a/picolisp/Makefile.common b/picolisp/Makefile.common
index fd0a905283..0dd76b206a 100644
--- a/picolisp/Makefile.common
+++ b/picolisp/Makefile.common
@@ -3,7 +3,7 @@
 # used by wip/picolisp64/Makefile
 
 DISTNAME=	picoLisp-${PIL_VERSION}
-PIL_VERSION=	17.6
+PIL_VERSION=	19.12
 CATEGORIES=	lang
 MASTER_SITES=	http://software-lab.de/
 EXTRACT_SUFX=	.tgz
diff --git a/picolisp/PLIST b/picolisp/PLIST
index 1bee58a99e..d22921f2ee 100644
--- a/picolisp/PLIST
+++ b/picolisp/PLIST
@@ -13,6 +13,7 @@ lib/picolisp/lib/complete.l
 lib/picolisp/lib/conDbgc.l
 lib/picolisp/lib/db.l
 lib/picolisp/lib/db32-64.l
+lib/picolisp/lib/dbgc.l
 lib/picolisp/lib/debug.l
 lib/picolisp/lib/ed.l
 lib/picolisp/lib/edit.l
@@ -39,12 +40,11 @@ lib/picolisp/lib/misc.l
 lib/picolisp/lib/native.l
 lib/picolisp/lib/nodroid.l
 lib/picolisp/lib/openGl.l
+lib/picolisp/lib/pdfPage.l
 lib/picolisp/lib/pilog.l
 lib/picolisp/lib/prof.l
 lib/picolisp/lib/ps.l
-lib/picolisp/lib/readline.l
 lib/picolisp/lib/role.l
-lib/picolisp/lib/rsa.l
 lib/picolisp/lib/scrape.l
 lib/picolisp/lib/simul.l
 lib/picolisp/lib/sq.l
@@ -54,8 +54,9 @@ lib/picolisp/lib/test.l
 lib/picolisp/lib/tex.l
 lib/picolisp/lib/tinymce.l
 lib/picolisp/lib/too.l
-lib/picolisp/lib/tsm.l
 lib/picolisp/lib/user.l
+lib/picolisp/lib/vip.l
+lib/picolisp/lib/wide.l
 lib/picolisp/lib/xhtml.l
 lib/picolisp/lib/xm.l
 lib/picolisp/lib/xml.l
@@ -67,6 +68,7 @@ lib/picolisp/loc/CH.l
 lib/picolisp/loc/DE.l
 lib/picolisp/loc/ES.l
 lib/picolisp/loc/FR.l
+lib/picolisp/loc/GR.l
 lib/picolisp/loc/JP.l
 lib/picolisp/loc/NIL.l
 lib/picolisp/loc/NO.l
@@ -75,10 +77,12 @@ lib/picolisp/loc/SE.l
 lib/picolisp/loc/UK.l
 lib/picolisp/loc/US.l
 lib/picolisp/loc/ar
+lib/picolisp/loc/ca
 lib/picolisp/loc/ch
 lib/picolisp/loc/de
 lib/picolisp/loc/es
 lib/picolisp/loc/fr
+lib/picolisp/loc/gr
 lib/picolisp/loc/jp
 lib/picolisp/loc/no
 lib/picolisp/loc/ru
diff --git a/picolisp/distinfo b/picolisp/distinfo
index 1c74a55f5a..4916163ffc 100644
--- a/picolisp/distinfo
+++ b/picolisp/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (picoLisp-17.6.tgz) = c8ef1b687d27cd9dd28f39f4f33b430b4be850b3
-RMD160 (picoLisp-17.6.tgz) = ff9fe4f0e62364975aee253eef296eaa03616f5d
-SHA512 (picoLisp-17.6.tgz) = f7e8aaf6a20c342af98fb948885eb5aebca305f064e69d00fd5fc33b90ad131777686490cb967c16750889a6d649bb95c8c250353a2cc12fe9ff95e63e83751b
-Size (picoLisp-17.6.tgz) = 992572 bytes
-SHA1 (patch-src_Makefile) = fe320943e1660063e3c916d958eb2161c22d86f1
+SHA1 (picoLisp-19.12.tgz) = d0d9c65c8fe61eafc4fa91a66ce3506cfab8a0ff
+RMD160 (picoLisp-19.12.tgz) = 25700d9597378a6d0947b5687b36e485f1795c6f
+SHA512 (picoLisp-19.12.tgz) = b2ac1a79e9b0d358ad800666c403a397268998efaa66c899c181770c94ad2f62f5908840eeaf881bbe57846c74dc579601868d6d0594c8b23f6fd0023dff9c35
+Size (picoLisp-19.12.tgz) = 1018982 bytes
+SHA1 (patch-src_Makefile) = e47670535a76657af9f36079a6ca28049033af6a
diff --git a/picolisp/patches/patch-src_Makefile b/picolisp/patches/patch-src_Makefile
index 35374c5312..af0ca290f6 100644
--- a/picolisp/patches/patch-src_Makefile
+++ b/picolisp/patches/patch-src_Makefile
@@ -1,13 +1,15 @@
 $NetBSD$
 
---- src/Makefile.orig	2016-02-02 15:52:49.000000000 +0000
+Add -fpic flag for NetBSD builds.
+
+--- src/Makefile.orig	2019-01-30 14:32:00.000000000 +0000
 +++ src/Makefile
-@@ -48,7 +48,7 @@ ifeq ($(shell uname), FreeBSD)
+@@ -51,7 +51,7 @@ ifeq ($(shell uname), FreeBSD)
  else
  ifeq ($(shell uname), NetBSD)
  	OS = NetBSD
--	CFLAGS += -m32
-+	CFLAGS += -m32 -fpic
- 	PICOLISP-FLAGS = -m32 -rdynamic
+-	CFLAGS += ${M32}
++	CFLAGS += ${M32} -fpic
+ 	PICOLISP-FLAGS = ${M32} -rdynamic
  	LIB-FLAGS = -lm
- 	DYNAMIC-LIB-FLAGS = -m32 -shared -export-dynamic
+ 	DYNAMIC-LIB-FLAGS = ${M32} -shared -export-dynamic
diff --git a/picolisp64/PLIST b/picolisp64/PLIST
index 1bee58a99e..d22921f2ee 100644
--- a/picolisp64/PLIST
+++ b/picolisp64/PLIST
@@ -13,6 +13,7 @@ lib/picolisp/lib/complete.l
 lib/picolisp/lib/conDbgc.l
 lib/picolisp/lib/db.l
 lib/picolisp/lib/db32-64.l
+lib/picolisp/lib/dbgc.l
 lib/picolisp/lib/debug.l
 lib/picolisp/lib/ed.l
 lib/picolisp/lib/edit.l
@@ -39,12 +40,11 @@ lib/picolisp/lib/misc.l
 lib/picolisp/lib/native.l
 lib/picolisp/lib/nodroid.l
 lib/picolisp/lib/openGl.l
+lib/picolisp/lib/pdfPage.l
 lib/picolisp/lib/pilog.l
 lib/picolisp/lib/prof.l
 lib/picolisp/lib/ps.l
-lib/picolisp/lib/readline.l
 lib/picolisp/lib/role.l
-lib/picolisp/lib/rsa.l
 lib/picolisp/lib/scrape.l
 lib/picolisp/lib/simul.l
 lib/picolisp/lib/sq.l
@@ -54,8 +54,9 @@ lib/picolisp/lib/test.l
 lib/picolisp/lib/tex.l
 lib/picolisp/lib/tinymce.l
 lib/picolisp/lib/too.l
-lib/picolisp/lib/tsm.l
 lib/picolisp/lib/user.l
+lib/picolisp/lib/vip.l
+lib/picolisp/lib/wide.l
 lib/picolisp/lib/xhtml.l
 lib/picolisp/lib/xm.l
 lib/picolisp/lib/xml.l
@@ -67,6 +68,7 @@ lib/picolisp/loc/CH.l
 lib/picolisp/loc/DE.l
 lib/picolisp/loc/ES.l
 lib/picolisp/loc/FR.l
+lib/picolisp/loc/GR.l
 lib/picolisp/loc/JP.l
 lib/picolisp/loc/NIL.l
 lib/picolisp/loc/NO.l
@@ -75,10 +77,12 @@ lib/picolisp/loc/SE.l
 lib/picolisp/loc/UK.l
 lib/picolisp/loc/US.l
 lib/picolisp/loc/ar
+lib/picolisp/loc/ca
 lib/picolisp/loc/ch
 lib/picolisp/loc/de
 lib/picolisp/loc/es
 lib/picolisp/loc/fr
+lib/picolisp/loc/gr
 lib/picolisp/loc/jp
 lib/picolisp/loc/no
 lib/picolisp/loc/ru
diff --git a/picolisp64/distinfo b/picolisp64/distinfo
index 79b7bc5ba7..6bd9f30326 100644
--- a/picolisp64/distinfo
+++ b/picolisp64/distinfo
@@ -1,10 +1,10 @@
 $NetBSD$
 
-SHA1 (picoLisp-17.6.tgz) = c8ef1b687d27cd9dd28f39f4f33b430b4be850b3
-RMD160 (picoLisp-17.6.tgz) = ff9fe4f0e62364975aee253eef296eaa03616f5d
-SHA512 (picoLisp-17.6.tgz) = f7e8aaf6a20c342af98fb948885eb5aebca305f064e69d00fd5fc33b90ad131777686490cb967c16750889a6d649bb95c8c250353a2cc12fe9ff95e63e83751b
-Size (picoLisp-17.6.tgz) = 992572 bytes
-SHA1 (patch-src64_Makefile) = e43fb349d1708ed905e670bac416f189e6ba2c85
+SHA1 (picoLisp-19.12.tgz) = d0d9c65c8fe61eafc4fa91a66ce3506cfab8a0ff
+RMD160 (picoLisp-19.12.tgz) = 25700d9597378a6d0947b5687b36e485f1795c6f
+SHA512 (picoLisp-19.12.tgz) = b2ac1a79e9b0d358ad800666c403a397268998efaa66c899c181770c94ad2f62f5908840eeaf881bbe57846c74dc579601868d6d0594c8b23f6fd0023dff9c35
+Size (picoLisp-19.12.tgz) = 1018982 bytes
+SHA1 (patch-src64_Makefile) = 7bb8ca82012929932147a44c84fecd6691bae44d
 SHA1 (patch-src64_sys_x86-64.netBsd.code.l) = b80e93e13ce2d3cdeb74cd1c0d3f0e3a33a5cbf4
 SHA1 (patch-src64_sys_x86-64.netBsd.defs.l) = f4295dec32dfa835df723f3cca2dbc04a0af0bda
-SHA1 (patch-src_Makefile) = fe320943e1660063e3c916d958eb2161c22d86f1
+SHA1 (patch-src_Makefile) = 06d715b2ca6e9492ab49cbbd52a3a641c6eb7ca8
diff --git a/picolisp64/patches/patch-src64_Makefile b/picolisp64/patches/patch-src64_Makefile
index a0406b4a7f..dc45b3df40 100644
--- a/picolisp64/patches/patch-src64_Makefile
+++ b/picolisp64/patches/patch-src64_Makefile
@@ -1,49 +1,49 @@
 $NetBSD$
 
-Add support for NetBSD
+Add NetBSD sections.
 
---- src64/Makefile.orig	2016-12-05 12:09:18.000000000 +0000
+--- src64/Makefile.orig	2017-10-31 16:01:54.000000000 +0000
 +++ src64/Makefile
-@@ -28,11 +28,16 @@ else
- 						UNAME = SunOS
- 						MACHINE = x86_64
- 					else
--						UNAME = $(shell uname)
--						ifeq ($(MAKECMDGOALS), emu)
--							MACHINE = emu
-+						ifeq ($(MAKECMDGOALS), x86-64.netBsd)
-+							UNAME = NetBSD
-+							MACHINE = x86_64
+@@ -32,11 +32,16 @@ else
+ 							UNAME = SunOS
+ 							MACHINE = x86_64
  						else
--							MACHINE = $(shell uname -m)
-+							UNAME = $(shell uname)
-+							ifeq ($(MAKECMDGOALS), emu)
-+								MACHINE = emu
-+							else
-+								MACHINE = $(shell uname -m)
-+							endif
+-							UNAME = $(shell uname)
+-							ifeq ($(MAKECMDGOALS), emu)
+-								MACHINE = emu
++	                                               ifeq ($(MAKECMDGOALS), x86-64.netBsd)
++								UNAME = NetBSD
++								MACHINE = x86_64
+ 							else
+-								MACHINE = $(shell uname -m)
++								UNAME = $(shell uname)
++								ifeq ($(MAKECMDGOALS), emu)
++									MACHINE = emu
++								else
++									MACHINE = $(shell uname -m)
++								endif
+ 							endif
  						endif
  					endif
+@@ -119,6 +124,17 @@ else
+ 					LD-MAIN = -m64 -lc -lm -ldl -lsocket -lnsl
+ 					LD-SHARED = -m64 -shared
+ 					STRIP = strip
++				else
++					ifeq ($(UNAME), NetBSD)
++						OS = NetBSD
++						SYS = .netBsd
++						FMT = .s
++						ARCH = x86-64
++						AS = as
++						LD-MAIN = -m64 -rdynamic -lc -lm
++						LD-SHARED = -m64 -shared -export-dynamic
++						STRIP = strip
++					endif
  				endif
-@@ -103,6 +108,17 @@ else
- 				LD-MAIN = -m64 -lc -lm -ldl -lsocket -lnsl
- 				LD-SHARED = -m64 -shared
- 				STRIP = strip
-+			else
-+				ifeq ($(UNAME), NetBSD)
-+					OS = NetBSD
-+					SYS = .netBsd
-+					FMT = .s
-+					ARCH = x86-64
-+					AS = as
-+					LD-MAIN = -m64 -rdynamic -lc -lm
-+					LD-SHARED = -m64 -shared -export-dynamic
-+					STRIP = strip
-+				endif
  			endif
  		endif
- 	endif
-@@ -124,6 +140,7 @@ ppc64.linux: $(sFiles)
+@@ -142,6 +158,7 @@ ppc64.linux: $(sFiles)
  x86-64.freeBsd: $(sFiles)
  x86-64.openBsd: $(sFiles)
  x86-64.sunOs: $(sFiles)
diff --git a/picolisp64/patches/patch-src_Makefile b/picolisp64/patches/patch-src_Makefile
index 35374c5312..bdefa7d1e5 100644
--- a/picolisp64/patches/patch-src_Makefile
+++ b/picolisp64/patches/patch-src_Makefile
@@ -1,13 +1,15 @@
 $NetBSD$
 
---- src/Makefile.orig	2016-02-02 15:52:49.000000000 +0000
+Add -fpic for NetBSD builds.
+
+--- src/Makefile.orig	2019-01-30 14:32:00.000000000 +0000
 +++ src/Makefile
-@@ -48,7 +48,7 @@ ifeq ($(shell uname), FreeBSD)
+@@ -51,7 +51,7 @@ ifeq ($(shell uname), FreeBSD)
  else
  ifeq ($(shell uname), NetBSD)
  	OS = NetBSD
--	CFLAGS += -m32
-+	CFLAGS += -m32 -fpic
- 	PICOLISP-FLAGS = -m32 -rdynamic
+-	CFLAGS += ${M32}
++	CFLAGS += ${M32} -fpic
+ 	PICOLISP-FLAGS = ${M32} -rdynamic
  	LIB-FLAGS = -lm
- 	DYNAMIC-LIB-FLAGS = -m32 -shared -export-dynamic
+ 	DYNAMIC-LIB-FLAGS = ${M32} -shared -export-dynamic


Home | Main Index | Thread Index | Old Index