Update spl to 1.0pre3.

Based on patch provided by Raphael Langerhorst in PR 35308.

1.0pre3:
 - Many tiny code cleanups and some small fixes
 - Some fixes for *BSD systems and 64bit sysytems
 - List of builtin functions is now a hash (thx to bernd)
 - Improved performance by reusing stack structs (thx to bernd)
1.0pre2:
 It contains some small cleanups and build fixes related to mod_fann and mod_gl.
1.0pre1:
 It only contains some small bugfixes and cleanups compared to version 0.9i
0.9i:
 This release is primarly a bugfix release.

7 files changed, 84 insertions, 26 deletions

diff --git a/lang/spl/Makefile b/lang/spl/Makefile
index 8a5dfc5c8d3..11dcccf3cab 100644
--- a/lang/spl/Makefile
+++ b/lang/spl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/01/08 02:24:13 obache Exp $
+# $NetBSD: Makefile,v 1.8 2007/03/17 08:45:03 obache Exp $
 #
 
-DISTNAME=	spl-0.9h
-PKGREVISION=	3
+DISTNAME=	spl-1.0pre3
 CATEGORIES=	lang
 MASTER_SITES=	http://www.clifford.at/spl/releases/ \
 		http://www.clifford.at/spl/releases/OLD/
@@ -11,18 +10,20 @@ MAINTAINER=	raphael@raphael.g-system.at
 HOMEPAGE=	http://www.clifford.at/spl/
 COMMENT=	The SPL Programming Language
 
-USE_LANGUAGES=	c
+USE_LANGUAGES=	c c++
 USE_TOOLS+=	bash gmake gawk
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-patch
 SUBST_FILES.prefix=	GNUmakefile
 SUBST_SED.prefix+=	-e 's,^  prefix.*,  prefix = ${PREFIX},g'
+SUBST_SED.prefix+=	-e 's,^ENABLE_OPENGL_SUPPORT.*,ENABLE_OPENGL_SUPPORT=0,g'
 SUBST_SED.prefix+=	-e 's,^  cgibin_libdir.*,  cgibin_libdir = ${PREFIX}/libexec/cgi-bin,g'
 
 #subst.mk does not correctly detect GNUmakefile as text file
 _SUBST_IS_TEXT_FILE=true
 
+MAKE_ENV+=	ENABLE_OPENGL_SUPPORT=0
 MAKE_FILE=	GNUmakefile
 BUILD_TARGET=	all spldoc
 EGDIR=		${PREFIX}/share/examples/spl
@@ -33,7 +34,7 @@ post-install:
 	${CHMOD} a+rwx ${PREFIX}/libexec/cgi-bin/webspl_cache
 	${LN} -s ${PREFIX}/lib/spl_modules ${PREFIX}/libexec/cgi-bin/spl_modules
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC} && ${PAX} -rw -p am README* manual.tex spldoc webspl_demo webspltut ${DOCDIR}
+	cd ${WRKSRC} && ${PAX} -rw -p am README* manual.tex spldoc webspl_demo webspltut qtdemo ${DOCDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}/examples && ${INSTALL_DATA} example* ${EGDIR}
 
diff --git a/lang/spl/PLIST b/lang/spl/PLIST
index 5aac02d6dcd..acf7bf3ecb1 100644
--- a/lang/spl/PLIST
+++ b/lang/spl/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/19 13:44:50 rillig Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/03/17 08:45:04 obache Exp $
 bin/spl-config
 bin/splrun
+bin/webspld
 include/spl.h
 lib/libspl.a
+lib/spl_modules/moddir.list
 lib/spl_modules/mod_array.so
 lib/spl_modules/mod_bits.so
 lib/spl_modules/mod_cgi.so
@@ -15,6 +17,7 @@ lib/spl_modules/mod_encode_xml.so
 lib/spl_modules/mod_environ.so
 lib/spl_modules/mod_file.so
 lib/spl_modules/mod_format_ini.splb
+@comment lib/spl_modules/mod_gl.so
 lib/spl_modules/mod_prime.so
 lib/spl_modules/mod_sql.so
 lib/spl_modules/mod_sql_utils.splb
@@ -22,6 +25,7 @@ lib/spl_modules/mod_system.so
 lib/spl_modules/mod_task.so
 lib/spl_modules/mod_termio.so
 lib/spl_modules/mod_time.so
+lib/spl_modules/mod_uuidgen.so
 lib/spl_modules/mod_w2t.splb
 lib/spl_modules/mod_webdebug.so
 lib/spl_modules/mod_wsf.splb
@@ -72,6 +76,8 @@ share/doc/spl/spldoc/format_ini.html
 share/doc/spl/spldoc/format_ini.txt
 share/doc/spl/spldoc/format_xml.html
 share/doc/spl/spldoc/format_xml.txt
+@comment share/doc/spl/spldoc/gl.html
+@comment share/doc/spl/spldoc/gl.txt
 share/doc/spl/spldoc/kde.html
 share/doc/spl/spldoc/kde.txt
 share/doc/spl/spldoc/multimouse.html
@@ -158,6 +164,16 @@ share/doc/spl/webspl_demo/wsfd_calc.webspl
 share/doc/spl/webspl_demo/wsfd_calc.xml
 share/doc/spl/webspl_demo/wsfdemo.webspl
 share/doc/spl/webspl_demo/wsfgraph.webspl
+share/doc/spl/qtdemo/qtdemo001.spl
+share/doc/spl/qtdemo/qtdemo002.spl
+share/doc/spl/qtdemo/qtdemo002.ui
+share/doc/spl/qtdemo/qtdemo003.spl
+share/doc/spl/qtdemo/qtdemo003.ui
+share/doc/spl/qtdemo/qtdemo004.spl
+share/doc/spl/qtdemo/qtdemo004.ui
+share/doc/spl/qtdemo/qtdemo005.spl
+share/doc/spl/qtdemo/qtdemo006.spl
+share/doc/spl/qtdemo/qtdemo007.spl
 share/doc/spl/webspltut/index.html
 share/doc/spl/webspltut/webspltut00.webspl
 share/doc/spl/webspltut/webspltut01.webspl
@@ -306,6 +322,7 @@ share/examples/spl/example67.expected
 share/examples/spl/example67.spl
 @dirrm share/examples/spl
 @dirrm share/doc/spl/spldoc
+@dirrm share/doc/spl/qtdemo
 @dirrm share/doc/spl/webspltut
 @dirrm share/doc/spl/webspl_demo/images
 @dirrm share/doc/spl/webspl_demo
diff --git a/lang/spl/distinfo b/lang/spl/distinfo
index 8648ef0d103..8c1b6c3e8ab 100644
--- a/lang/spl/distinfo
+++ b/lang/spl/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2006/05/29 16:31:43 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/03/17 08:45:04 obache Exp $
 
-SHA1 (spl-0.9h.tar.gz) = 030b25a13d52629b75e8fd3d076d9e431c1f7b49
-RMD160 (spl-0.9h.tar.gz) = b794f9590e00dd2cd2c161c1edf5ece4007a0a3d
-Size (spl-0.9h.tar.gz) = 329352 bytes
-SHA1 (patch-aa) = ed93b5bde73c3b5b1ce69deae82a6f0fd6f4b609
-SHA1 (patch-ab) = 58a75944874ad881aa83a420a78c6b6c0943eee1
+SHA1 (spl-1.0pre3.tar.gz) = b4f3db44c5ba6b8f49ee25553bd7328be946abbb
+RMD160 (spl-1.0pre3.tar.gz) = 311db05cb5f5c14145fa63d3548519535ccbf7ff
+Size (spl-1.0pre3.tar.gz) = 335431 bytes
+SHA1 (patch-aa) = 2033872117191147c31781d47c59125f155dbe5d
+SHA1 (patch-ab) = e1f185e5e139ecfdf31148697ac691358ee7aea1
+SHA1 (patch-ac) = 31d69a712c93767f83de13c9c6e504a097602321
+SHA1 (patch-ad) = 12eb05a60727112b63c4ad64d8ee0f68e8f31ab0
diff --git a/lang/spl/patches/patch-aa b/lang/spl/patches/patch-aa
index adf7baa6cda..fe64faddbf3 100644
--- a/lang/spl/patches/patch-aa
+++ b/lang/spl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2006/05/29 16:31:43 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2007/03/17 08:45:04 obache Exp $
 
---- clib.c.orig	2006-05-15 09:49:19.000000000 +0000
+--- clib.c.orig	2006-11-14 13:54:32.000000000 +0000
 +++ clib.c
-@@ -366,13 +366,40 @@ static inline void DO_UNLOCK() {
+@@ -402,13 +402,40 @@ static inline void DO_UNLOCK() {
  
  #  else
  
diff --git a/lang/spl/patches/patch-ab b/lang/spl/patches/patch-ab
index 16fd1ef7ace..db7a45faa71 100644
--- a/lang/spl/patches/patch-ab
+++ b/lang/spl/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2006/05/29 16:31:43 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2007/03/17 08:45:05 obache Exp $
 
---- GNUmakefile.orig	2006-05-29 15:40:44.000000000 +0000
+--- GNUmakefile.orig	2007-03-17 08:18:09.000000000 +0000
 +++ GNUmakefile
 @@ -22,7 +22,7 @@
  BUILDING_FOR_MACOSX := $(shell uname | grep -qvi darwin; echo $$?)
@@ -11,12 +11,3 @@ $NetBSD: patch-ab,v 1.1 2006/05/29 16:31:43 joerg Exp $
  BUILDING_FOR_IRIX   := $(shell uname | grep -qvi irix;   echo $$?)
  
  
-@@ -159,7 +159,7 @@ else
- endif
- 
- ifeq ($(ENABLE_REGEX_SUPPORT),1)
--  LDLIBS += $(shell pcre-config --libs)
-+  LDLIBS += $(shell pcre-config --libs) -R${PREFIX}/lib
-   DLL_LIBS += $(shell pcre-config --libs)
-   CFLAGS += $(shell pcre-config --cflags) -DENABLE_REGEX_SUPPORT
- endif
diff --git a/lang/spl/patches/patch-ac b/lang/spl/patches/patch-ac
new file mode 100644
index 00000000000..2d8485cccbd
--- /dev/null
+++ b/lang/spl/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1 2007/03/17 08:45:06 obache Exp $
+
+Index: spl_modules/mod_uuidgen.c
+===================================================================
+--- spl_modules/mod_uuidgen.c.orig	2006-10-25 08:58:24.000000000 +0000
++++ spl_modules/mod_uuidgen.c
+@@ -40,16 +40,22 @@ extern void SPL_ABI(spl_mod_uuidgen_done
+ 
+ /**
+  * This function generates a UUID (using libuuid) and returns a 36
+- * character string with a hex representation of th uuid.
++ * character string with a hex representation of the uuid.
+  */
+ // builtin uuidgen()
+ static struct spl_node *handler_uuidgen(struct spl_task *task UNUSED, void *data UNUSED)
+ {
+ 	uuid_t my_uuid;
++#if USEBSDAPI
++	char* my_uuid_string;
++	uint32_t status;
++	uuid_create(&my_uuid,&status);
++	uuid_to_string(&my_uuid,&my_uuid_string,&status);
++#else
+ 	char my_uuid_string[64];
+-
+ 	uuid_generate(my_uuid);
+ 	uuid_unparse(my_uuid, my_uuid_string);
++#endif
+ 
+ 	for (int i=0; my_uuid_string[i]; i++)
+ 		if (my_uuid_string[i] >= 'A' && my_uuid_string[i] <= 'Z')
diff --git a/lang/spl/patches/patch-ad b/lang/spl/patches/patch-ad
new file mode 100644
index 00000000000..74bcf8a01cb
--- /dev/null
+++ b/lang/spl/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2007/03/17 08:45:07 obache Exp $
+
+--- syscheck.sh.orig	2006-10-25 08:24:18.000000000 +0000
++++ syscheck.sh
+@@ -97,9 +97,9 @@ case "$1" in
+ 			[ -f "$file" ] && { result="$file"; break; }
+ 		done
+ 		if [ "$1" = "opengl" ]; then
+-			[ "$result" == "0" ] || result=1
++			[ "$result" = "0" ] || result=1
+ 		else
+-			[ "$result" == "0" ] && result=""
++			[ "$result" = "0" ] && result=""
+ 		fi
+ 		;;
+ 	libsmoke)