pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/35308: [PATCH] update lang/spl version from 0.9h to 1.0pre3
>Number: 35308
>Category: pkg
>Synopsis: [PATCH] update lang/spl version from 0.9h to 1.0pre3
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Dec 21 17:40:00 +0000 2006
>Originator: Raphael Langerhorst
>Release: 3
>Organization:
>Environment:
NetBSD home.raphael.g-system.at 3.0 NetBSD 3.0 (HOME-$Revision: 1.42.2.4 $) #0:
Sun Jul 30 10:37:56 CEST 2006
root%home.raphael.g-system.at@localhost:/usr/src/sys/arch/amd64/compile/HOME
amd64
>Description:
SPL 1.0pre3 has been released.
There were a couple of intermediate releases meanwhile. They include a couple
of bug fixes, performance improvements as well as some features.
The attached patch is to move lang/spl from 0.9h to 1.0pre3, it is tested on
netbsd/i386 and netbsd/amd64.
patches/patch-ac is a new file.
I've sent parts of patch-ab upstream (already in 1.0pre3), so it's removed from
the patch.
>How-To-Repeat:
>Fix:
Apply attached patch. Please note that patches/patch-ac is a new file!
You may also need to update distinfo based on $NetBSD$ changes to patch-ac
attached patch:
Index: lang/spl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/spl/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- lang/spl/Makefile 4 Oct 2006 21:46:14 -0000 1.6
+++ lang/spl/Makefile 21 Dec 2006 16:47:20 -0000
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.6 2006/10/04 21:46:14 wiz Exp $
#
-DISTNAME= spl-0.9h
-PKGREVISION= 3
+DISTNAME= spl-1.0pre3
+#PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= http://www.clifford.at/spl/releases/
@@ -10,18 +10,20 @@
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
@@ -32,7 +34,7 @@
${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}
Index: lang/spl/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/spl/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- lang/spl/PLIST 19 May 2006 13:44:50 -0000 1.3
+++ lang/spl/PLIST 21 Dec 2006 16:47:20 -0000
@@ -3,6 +3,7 @@
bin/splrun
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 +16,7 @@
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 +24,7 @@
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 +75,8 @@
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 +163,16 @@
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 +321,7 @@
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
Index: lang/spl/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/spl/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- lang/spl/distinfo 29 May 2006 16:31:43 -0000 1.2
+++ lang/spl/distinfo 21 Dec 2006 16:47:20 -0000
@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.2 2006/05/29 16:31:43 joerg Exp $
-SHA1 (spl-0.9h.tar.gz) = 030b25a13d52629b75e8fd3d076d9e431c1f7b49
-RMD160 (spl-0.9h.tar.gz) = b794f9590e00dd2cd2c161c1edf5ece4007a0a3d
-Size (spl-0.9h.tar.gz) = 329352 bytes
+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) = ed93b5bde73c3b5b1ce69deae82a6f0fd6f4b609
-SHA1 (patch-ab) = 58a75944874ad881aa83a420a78c6b6c0943eee1
+SHA1 (patch-ab) = d5150dd98217ff9d9697c8dbe5a44d64bc5c7eb3
+SHA1 (patch-ac) = 14982250dfcbebcc500282b28220d29be069be59
Index: lang/spl/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/lang/spl/patches/patch-ab,v
retrieving revision 1.1
diff -u -r1.1 patch-ab
--- lang/spl/patches/patch-ab 29 May 2006 16:31:43 -0000 1.1
+++ lang/spl/patches/patch-ab 21 Dec 2006 16:47:21 -0000
@@ -11,12 +11,3 @@
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
Index: lang/spl/patches/patch-ac
===================================================================
RCS file: lang/spl/patches/patch-ac
diff -N lang/spl/patches/patch-ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/spl/patches/patch-ac 21 Dec 2006 16:47:21 -0000
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Index: spl_modules/mod_uuidgen.c
+===================================================================
+--- spl_modules/mod_uuidgen.c (revision 945)
++++ spl_modules/mod_uuidgen.c (working copy)
+@@ -40,16 +40,22 @@
+
+ /**
+ * 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')
Home |
Main Index |
Thread Index |
Old Index