Attachment #55624 for bug #84023

View | Details | Raw Unified | Return to bug 84023
Collapse All | Expand All




#

PORTNAME=	openvrml
PORTVERSION=	0.15.9
PORTREVISION=	3
CATEGORIES=	www graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	VRML97 runtime and browser ("lookat")

BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla	\
		${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone	\
		pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
		png.5:${PORTSDIR}/graphics/png \
		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig


USE_REINPLACE=	yes
USE_GL=		yes
USE_MESA=	yes
USE_X_PREFIX=	yes
USE_GNOME=	gnomehack gtk20
USE_SDL=	sdl
USE_GCC=	3.4
USE_LIBTOOL_VER=	15
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib -largp -Wl,--rpath -Wl,${X11BASE}/lib/mozilla -L${X11BASE}/lib -lXext" \
		XPIDLFLAGS="-I${X11BASE}/share/idl/mozilla"
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE=	yes
INSTALLS_SHLIB=	yes

PLIST_SUB=	VER=${PORTVERSION}
SUB_FILES=	lookat.sh

.if !defined(NOPORTDOCS)
PORTDOCS=	*
.endif

.include <bsd.port.pre.mk>

.if ${ARCH} != "i386"
BROKEN=		"Does not compile on ${ARCH}"
.endif

.if ${OSVERSION} < 500000
BROKEN=		"Does not compile on ${OPSYS}-${OSREL}"
.endif

.if exists(${LOCALBASE}/include/boost/python.hpp)
LIB_DEPENDS+=	boost_python.2:${PORTSDIR}/devel/boost-python
.else
LIB_DEPENDS+=	boost_regex.2:${PORTSDIR}/devel/boost
.endif

post-patch:

		${WRKSRC}/configure

post-install:
	${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${PREFIX}/bin
		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
	@${FIND} ${PREFIX}/include/openvrml -type d | ${SORT} -r | \
		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	${CP} -R ${WRKSRC}/doc/manual/ ${DOCSDIR}
.endif
	@${ECHO_MSG}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_MSG}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)www/openvrml/distinfo (-2 / +2 lines)
1	MD5 (openvrml-0.14.3.tar.gz) = 43d4015a98c7e2479e1164184da0e8e6	1	MD5 (openvrml-0.15.9.tar.gz) = a4134d658685be71596c620169221e6f
2	SIZE (openvrml-0.14.3.tar.gz) = 2996458	2	SIZE (openvrml-0.15.9.tar.gz) = 5523568

Line 0 Link Here

(-)www/openvrml/files/lookat.sh.in (+4 lines)
	1	#! /bin/sh
	2	# $FreeBSD$
	3
	4	LD_LIBRARY_PATH=%%X11BASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1




--- Makefile.in.orig	Mon Jul  4 01:29:49 2005
+++ Makefile.in	Fri Jul 22 16:32:32 2005
@@ -236,7 +236,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = doc ide-projects m4 models lib java src mozilla-plugin tests
+SUBDIRS = ide-projects m4 models lib java src mozilla-plugin tests
 
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = \
         openvrml.pc.in \




--- mozilla-plugin/src/openvrml.cpp.orig	Sun Jul  3 10:31:21 2005
+++ mozilla-plugin/src/openvrml.cpp	Fri Jul 22 18:51:12 2005
@@ -45,6 +45,11 @@
 # endif
 # include "openvrml.h"
 
+# if defined(__FreeBSD__)
+#   include <sys/types.h>
+#   include <signal.h>
+# endif
+
 namespace {
 
     void printerr(const char * str);

Lines 1-11 Link Here

(-)www/openvrml/files/patch-openvrml:Makefile.in (-11 lines)
1	--- src/libopenvrml/openvrml/Makefile.in.orig Wed Apr 7 13:54:36 2004
2	+++ src/libopenvrml/openvrml/Makefile.in Wed Apr 7 13:55:02 2004
3	@@ -175,7 +175,7 @@
4	target_alias = @target_alias@
5	lib_LTLIBRARIES = libopenvrml.la
6
7	-openvrml_includedir = $(pkgincludedir)/openvrml
8	+openvrml_includedir = $(pkgincludedir)
9	openvrml_include_HEADERS = \
10	common.h \
11	basetypes.h \

Lines 1-11 Link Here

(-)www/openvrml/files/patch-openvrml:gl:Makefile.in (-11 lines)
1	--- src/libopenvrml-gl/openvrml/gl/Makefile.in.orig Wed Apr 7 14:11:15 2004
2	+++ src/libopenvrml-gl/openvrml/gl/Makefile.in Wed Apr 7 14:12:00 2004
3	@@ -193,7 +193,7 @@
4	AM_CXXFLAGS = @GL_CFLAGS@
5
6	@ENABLE_GL_RENDERER_TRUE@lib_LTLIBRARIES = libopenvrml-gl.la
7	-@ENABLE_GL_RENDERER_TRUE@openvrml_gl_includedir = $(pkgincludedir)/openvrml/gl
8	+@ENABLE_GL_RENDERER_TRUE@openvrml_gl_includedir = $(pkgincludedir)/gl
9	@ENABLE_GL_RENDERER_TRUE@openvrml_gl_include_HEADERS = viewer.h
10
11	@ENABLE_GL_RENDERER_TRUE@libopenvrml_gl_la_SOURCES = viewer.cpp




$FreeBSD: ports/www/openvrml/files/patch-openvrml:script.cpp,v 1.1 2004/11/17 18:28:48 glewis Exp $

--- src/libopenvrml/openvrml/script.cpp.orig	Tue Sep  9 00:56:42 2003
+++ src/libopenvrml/openvrml/script.cpp	Wed Nov 17 10:56:07 2004
@@ -1856,7 +1856,7 @@
 
     case field_value::sfcolor_id:
         {
-            using openvrml::sfcolor
+            using openvrml::sfcolor;
             const sfcolor & c = static_cast<const sfcolor &>(fieldValue);
             if (!SFColor::toJsval(c.value, this->cx, globalObj, &rval)) {
                 rval = JSVAL_NULL;
@@ -3056,7 +3056,7 @@
 
         auto_ptr<openvrml::sfcolor>
             sfcolor(new openvrml::sfcolor(color(rgb[0], rgb[1], rgb[2])));
-        auto_ptr<sfdata> sfdata(new sfdata(sfcolor.get()));
+        auto_ptr<sfdata> sfdata(new sfield::sfdata(sfcolor.get()));
         sfcolor.release();
         if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
         sfdata.release();
@@ -3236,7 +3236,7 @@
         std::auto_ptr<openvrml::sfimage>
                 sfimageClone(static_cast<openvrml::sfimage *>
                     (sfimage.clone().release()));
-        std::auto_ptr<sfdata> sfdata(new sfdata(sfimageClone.get()));
+        std::auto_ptr<sfdata> sfdata(new sfield::sfdata(sfimageClone.get()));
         sfimageClone.release();
         if (!JS_SetPrivate(cx, sfimageObj, sfdata.get())) { return JS_FALSE; }
         sfdata.release();
@@ -3355,7 +3355,7 @@
 
         auto_ptr<openvrml::sfimage>
             sfimage(new openvrml::sfimage(x, y, comp, &pixels[0]));
-        auto_ptr<sfdata> sfdata(new sfdata(sfimage.get()));
+        auto_ptr<sfdata> sfdata(new sfield::sfdata(sfimage.get()));
         sfimage.release();
         if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
         sfdata.release();
@@ -3483,7 +3483,7 @@
         using std::auto_ptr;
 
         auto_ptr<openvrml::sfnode> sfnodeClone(new openvrml::sfnode(node));
-        auto_ptr<sfdata> sfdata(new sfdata(sfnodeClone.get()));
+        auto_ptr<sfdata> sfdata(new sfield::sfdata(sfnodeClone.get()));
         sfnodeClone.release();
         if (!JS_SetPrivate(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; }
         sfdata.release();
@@ -3573,7 +3573,7 @@
     try {
         using std::auto_ptr;
         auto_ptr<openvrml::sfnode> sfnode(new openvrml::sfnode(nodes[0]));
-        auto_ptr<sfdata> sfdata(new sfdata(sfnode.get()));
+        auto_ptr<sfdata> sfdata(new sfield::sfdata(sfnode.get()));
         sfnode.release();
         if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
         sfdata.release();
@@ -3863,7 +3863,7 @@
     try {
         auto_ptr<openvrml::sfrotation>
             sfrotation(new openvrml::sfrotation(rotation(x, y, z, angle)));
-        auto_ptr<sfdata> sfdata(new sfdata(sfrotation.get()));
+        auto_ptr<sfdata> sfdata(new sfield::sfdata(sfrotation.get()));
         sfrotation.release();
         if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
         sfdata.release();
@@ -4325,7 +4325,7 @@
 
         auto_ptr<openvrml::sfvec2f>
             sfvec2f(new openvrml::sfvec2f(vec2f(x, y)));
-        auto_ptr<sfdata> sfdata(new sfdata(sfvec2f.get()));
+        auto_ptr<sfdata> sfdata(new sfield::sfdata(sfvec2f.get()));
         sfvec2f.release();
         if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
         sfdata.release();
@@ -4816,7 +4816,7 @@
 
         auto_ptr<openvrml::sfvec3f>
             sfvec3f(new openvrml::sfvec3f(vec3f(vec[0], vec[1], vec[2])));
-        auto_ptr<sfdata> sfdata(new sfdata(sfvec3f.get()));
+        auto_ptr<sfdata> sfdata(new sfield::sfdata(sfvec3f.get()));
         sfvec3f.release();
         if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
         sfdata.release();

Lines 1-8 Link Here

(-)www/openvrml/pkg-descr (-4 / +4 lines)
1	OpenVRML is a free cross-platform runtime for VRML97 available under	1	OpenVRML is a free cross-platform runtime for VRML97 available under
2	the GNU Lesser General Public License.	2	the GNU Lesser General Public License.
3		3
4	The basic OpenVRML distribution includes libraries you can use to	4	The basic OpenVRML distribution includes libraries you can use to
5	add VRML support to an application, and "Lookat", a simple	5	add VRML support to an application, and "Lookat", a simple
6	stand-alone VRML browser.	6	stand-alone VRML browser. A plug-in for mozilla is included.
7		7
8	WWW: http://openvrml.sourceforge.net/	8	WWW: http://openvrml.sourceforge.net/

Line 0 Link Here

(-)www/openvrml/pkg-message (+5 lines)
	1	===========================================
	2	Please run lookat via the script lookat.sh:
	3
	4	lookat.sh sample.wrl
	5	===========================================




bin/lookat
bin/lookat.sh
include/openvrml/openvrml/basetypes.h
include/openvrml/openvrml/bounding_volume.h
include/openvrml/openvrml/browser.h
include/openvrml/openvrml/common.h
include/openvrml/openvrml/event.h
include/openvrml/openvrml/exposedfield.h
include/openvrml/openvrml/field_value.h
include/openvrml/openvrml/frustum.h
include/openvrml/openvrml/gl/viewer.h
include/openvrml/openvrml/img.h
include/openvrml/openvrml/node.h
include/openvrml/openvrml/node_ptr.h
include/openvrml/openvrml/rendering_context.h
include/openvrml/openvrml/scope.h
include/openvrml/openvrml/script.h
include/openvrml/openvrml/system.h
include/openvrml/openvrml/viewer.h
include/openvrml/openvrml/vrml97node.h
lib/libopenvrml-gl.a
lib/libopenvrml-gl.so
lib/libopenvrml-gl.so.6
lib/libopenvrml.a
lib/libopenvrml.so
lib/libopenvrml.so.5
libdata/pkgconfig/openvrml-gl.pc
libdata/pkgconfig/openvrml.pc
libexec/openvrml-player
share/idl/openvrml-%%VER%%/openvrml.idl
share/pixmaps/lookat.xpm
lib/mozilla/plugins/openvrml.la
lib/mozilla/plugins/openvrml.so
lib/mozilla/plugins/openvrml.xpt
@dirrm include/openvrml/openvrml/gl
@dirrm include/openvrml/openvrml
@dirrm include/openvrml
@dirrm share/idl/openvrml-%%VER%%
@unexec rmdir %D/share/pixmaps 2>/dev/null || true

Return to bug 84023

Lines 6-13 Link Here

(-)www/openvrml/Makefile (-15 / +28 lines)
6	#	6	#
7		7
8	PORTNAME= openvrml	8	PORTNAME= openvrml
9	PORTVERSION= 0.14.3	9	PORTVERSION= 0.15.9
10	PORTREVISION= 3
11	CATEGORIES= www graphics	10	CATEGORIES= www graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 15-21 Link Here
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= VRML97 runtime and browser ("lookat")	15	COMMENT= VRML97 runtime and browser ("lookat")
17		16
18	BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla	17	BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla \
		18	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \
		19	pkg-config:${PORTSDIR}/devel/pkgconfig
19	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \	20	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
20	png.5:${PORTSDIR}/graphics/png \	21	png.5:${PORTSDIR}/graphics/png \
21	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig	22	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
Lines 23-49 Link Here
23		24
24	USE_REINPLACE= yes	25	USE_REINPLACE= yes
25	USE_GL= yes	26	USE_GL= yes
26	USE_MESA= yes
27	USE_X_PREFIX= yes	27	USE_X_PREFIX= yes
28	USE_GNOME= gnomehack	28	USE_GNOME= gnomehack gtk20
		29	USE_SDL= sdl
29	USE_GCC= 3.4	30	USE_GCC= 3.4
30	GNU_CONFIGURE= yes	31	USE_LIBTOOL_VER= 15
31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \	32	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
32	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXext"	33	LDFLAGS="-L${LOCALBASE}/lib -largp -Wl,--rpath -Wl,${X11BASE}/lib/mozilla -L${X11BASE}/lib -lXext" \
33	CONFIGURE_ARGS= --without-jdk	34	XPIDLFLAGS="-I${X11BASE}/share/idl/mozilla"
		35	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
34	USE_GMAKE= yes	36	USE_GMAKE= yes
35	INSTALLS_SHLIB= yes	37	INSTALLS_SHLIB= yes
36		38
		39	PLIST_SUB= VER=${PORTVERSION}
		40	SUB_FILES= lookat.sh
		41
37	.if !defined(NOPORTDOCS)	42	.if !defined(NOPORTDOCS)
38	PORTDOCS= # empty, not use * 'cause args too long (for find)	43	PORTDOCS= *
39	.endif	44	.endif
40		45
41	.include <bsd.port.pre.mk>	46	.include <bsd.port.pre.mk>
42		47
43	.if ${ARCH} != "i386"	48	.if ${ARCH} != "i386"
44	BROKEN= "Does not compile on !i386"	49	BROKEN= "Does not compile on ${ARCH}"
		50	.endif
		51
		52	.if ${OSVERSION} < 500000
		53	BROKEN= "Does not compile on ${OPSYS}-${OSREL}"
		54	.endif
		55
		56	.if exists(${LOCALBASE}/include/boost/python.hpp)
		57	LIB_DEPENDS+= boost_python.2:${PORTSDIR}/devel/boost-python
45	.else	58	.else
46	BROKEN= "Does not build on i386"	59	LIB_DEPENDS+= boost_regex.2:${PORTSDIR}/devel/boost
47	.endif	60	.endif
48		61
49	post-patch:	62	post-patch:
Lines 51-63 Link Here
51	${WRKSRC}/configure	64	${WRKSRC}/configure
52		65
53	post-install:	66	post-install:
54	@${FIND} ${PREFIX}/include/openvrml -type f \| \	67	${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${PREFIX}/bin
55	${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
56	@${FIND} ${PREFIX}/include/openvrml -type d \| ${SORT} -r \| \
57	${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
58	.if !defined(NOPORTDOCS)	68	.if !defined(NOPORTDOCS)
59	@${MKDIR} ${DOCSDIR}	69	@${MKDIR} ${DOCSDIR}
60	${CP} -R ${WRKSRC}/doc/manual/ ${DOCSDIR}	70	${CP} -R ${WRKSRC}/doc/manual/ ${DOCSDIR}
61	.endif	71	.endif
		72	@${ECHO_MSG}
		73	@${CAT} ${PKGMESSAGE}
		74	@${ECHO_MSG}
62		75
63	.include <bsd.port.post.mk>	76	.include <bsd.port.post.mk>

Lines 1-11 Link Here

(-)www/openvrml/files/patch-Makefile.in (-10 / +10 lines)
1	--- Makefile.in.orig Wed Apr 7 13:30:15 2004	1	--- Makefile.in.orig Mon Jul 4 01:29:49 2005
2	+++ Makefile.in Wed Apr 7 13:30:30 2004	2	+++ Makefile.in Fri Jul 22 16:32:32 2005
3	@@ -173,7 +173,7 @@	3	@@ -236,7 +236,7 @@
4	sharedstatedir = @sharedstatedir@	4	target_cpu = @target_cpu@
5	sysconfdir = @sysconfdir@	5	target_os = @target_os@
6	target_alias = @target_alias@	6	target_vendor = @target_vendor@
7	-SUBDIRS = doc ide-projects m4 models lib java src	7	-SUBDIRS = doc ide-projects m4 models lib java src mozilla-plugin tests
8	+SUBDIRS = ide-projects m4 models lib java src	8	+SUBDIRS = ide-projects m4 models lib java src mozilla-plugin tests
9
10	ACLOCAL_AMFLAGS = -I m4	9	ACLOCAL_AMFLAGS = -I m4
11		10	EXTRA_DIST = \
		11	openvrml.pc.in \

Line 0 Link Here

(-)www/openvrml/files/patch-mozilla-plugin_src_openvrml.cpp (+14 lines)
	1	--- mozilla-plugin/src/openvrml.cpp.orig Sun Jul 3 10:31:21 2005
	2	+++ mozilla-plugin/src/openvrml.cpp Fri Jul 22 18:51:12 2005
	3	@@ -45,6 +45,11 @@
	4	# endif
	5	# include "openvrml.h"
	6
	7	+# if defined(__FreeBSD__)
	8	+# include <sys/types.h>
	9	+# include <signal.h>
	10	+# endif
	11	+
	12	namespace {
	13
	14	void printerr(const char * str);

Lines 1-85 Link Here

(-)www/openvrml/files/patch-openvrml:script.cpp (-85 lines)
1	$FreeBSD: ports/www/openvrml/files/patch-openvrml:script.cpp,v 1.1 2004/11/17 18:28:48 glewis Exp $
2
3	--- src/libopenvrml/openvrml/script.cpp.orig Tue Sep 9 00:56:42 2003
4	+++ src/libopenvrml/openvrml/script.cpp Wed Nov 17 10:56:07 2004
5	@@ -1856,7 +1856,7 @@
6
7	case field_value::sfcolor_id:
8	{
9	- using openvrml::sfcolor
10	+ using openvrml::sfcolor;
11	const sfcolor & c = static_cast<const sfcolor &>(fieldValue);
12	if (!SFColor::toJsval(c.value, this->cx, globalObj, &rval)) {
13	rval = JSVAL_NULL;
14	@@ -3056,7 +3056,7 @@
15
16	auto_ptr<openvrml::sfcolor>
17	sfcolor(new openvrml::sfcolor(color(rgb[0], rgb[1], rgb[2])));
18	- auto_ptr<sfdata> sfdata(new sfdata(sfcolor.get()));
19	+ auto_ptr<sfdata> sfdata(new sfield::sfdata(sfcolor.get()));
20	sfcolor.release();
21	if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
22	sfdata.release();
23	@@ -3236,7 +3236,7 @@
24	std::auto_ptr<openvrml::sfimage>
25	sfimageClone(static_cast<openvrml::sfimage *>
26	(sfimage.clone().release()));
27	- std::auto_ptr<sfdata> sfdata(new sfdata(sfimageClone.get()));
28	+ std::auto_ptr<sfdata> sfdata(new sfield::sfdata(sfimageClone.get()));
29	sfimageClone.release();
30	if (!JS_SetPrivate(cx, sfimageObj, sfdata.get())) { return JS_FALSE; }
31	sfdata.release();
32	@@ -3355,7 +3355,7 @@
33
34	auto_ptr<openvrml::sfimage>
35	sfimage(new openvrml::sfimage(x, y, comp, &pixels[0]));
36	- auto_ptr<sfdata> sfdata(new sfdata(sfimage.get()));
37	+ auto_ptr<sfdata> sfdata(new sfield::sfdata(sfimage.get()));
38	sfimage.release();
39	if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
40	sfdata.release();
41	@@ -3483,7 +3483,7 @@
42	using std::auto_ptr;
43
44	auto_ptr<openvrml::sfnode> sfnodeClone(new openvrml::sfnode(node));
45	- auto_ptr<sfdata> sfdata(new sfdata(sfnodeClone.get()));
46	+ auto_ptr<sfdata> sfdata(new sfield::sfdata(sfnodeClone.get()));
47	sfnodeClone.release();
48	if (!JS_SetPrivate(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; }
49	sfdata.release();
50	@@ -3573,7 +3573,7 @@
51	try {
52	using std::auto_ptr;
53	auto_ptr<openvrml::sfnode> sfnode(new openvrml::sfnode(nodes[0]));
54	- auto_ptr<sfdata> sfdata(new sfdata(sfnode.get()));
55	+ auto_ptr<sfdata> sfdata(new sfield::sfdata(sfnode.get()));
56	sfnode.release();
57	if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
58	sfdata.release();
59	@@ -3863,7 +3863,7 @@
60	try {
61	auto_ptr<openvrml::sfrotation>
62	sfrotation(new openvrml::sfrotation(rotation(x, y, z, angle)));
63	- auto_ptr<sfdata> sfdata(new sfdata(sfrotation.get()));
64	+ auto_ptr<sfdata> sfdata(new sfield::sfdata(sfrotation.get()));
65	sfrotation.release();
66	if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
67	sfdata.release();
68	@@ -4325,7 +4325,7 @@
69
70	auto_ptr<openvrml::sfvec2f>
71	sfvec2f(new openvrml::sfvec2f(vec2f(x, y)));
72	- auto_ptr<sfdata> sfdata(new sfdata(sfvec2f.get()));
73	+ auto_ptr<sfdata> sfdata(new sfield::sfdata(sfvec2f.get()));
74	sfvec2f.release();
75	if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
76	sfdata.release();
77	@@ -4816,7 +4816,7 @@
78
79	auto_ptr<openvrml::sfvec3f>
80	sfvec3f(new openvrml::sfvec3f(vec3f(vec[0], vec[1], vec[2])));
81	- auto_ptr<sfdata> sfdata(new sfdata(sfvec3f.get()));
82	+ auto_ptr<sfdata> sfdata(new sfield::sfdata(sfvec3f.get()));
83	sfvec3f.release();
84	if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; }
85	sfdata.release();

Lines 1-11 Link Here

(-)www/openvrml/pkg-plist (-6 / +34 lines)
1	bin/lookat	1	bin/lookat
2	lib/libopenvrml.a	2	bin/lookat.sh
3	lib/libopenvrml.so	3	include/openvrml/openvrml/basetypes.h
4	lib/libopenvrml.so.4	4	include/openvrml/openvrml/bounding_volume.h
		5	include/openvrml/openvrml/browser.h
		6	include/openvrml/openvrml/common.h
		7	include/openvrml/openvrml/event.h
		8	include/openvrml/openvrml/exposedfield.h
		9	include/openvrml/openvrml/field_value.h
		10	include/openvrml/openvrml/frustum.h
		11	include/openvrml/openvrml/gl/viewer.h
		12	include/openvrml/openvrml/img.h
		13	include/openvrml/openvrml/node.h
		14	include/openvrml/openvrml/node_ptr.h
		15	include/openvrml/openvrml/rendering_context.h
		16	include/openvrml/openvrml/scope.h
		17	include/openvrml/openvrml/script.h
		18	include/openvrml/openvrml/system.h
		19	include/openvrml/openvrml/viewer.h
		20	include/openvrml/openvrml/vrml97node.h
5	lib/libopenvrml-gl.a	21	lib/libopenvrml-gl.a
6	lib/libopenvrml-gl.so	22	lib/libopenvrml-gl.so
7	lib/libopenvrml-gl.so.5	23	lib/libopenvrml-gl.so.6
8	libdata/pkgconfig/openvrml.pc	24	lib/libopenvrml.a
		25	lib/libopenvrml.so
		26	lib/libopenvrml.so.5
9	libdata/pkgconfig/openvrml-gl.pc	27	libdata/pkgconfig/openvrml-gl.pc
		28	libdata/pkgconfig/openvrml.pc
		29	libexec/openvrml-player
		30	share/idl/openvrml-%%VER%%/openvrml.idl
10	share/pixmaps/lookat.xpm	31	share/pixmaps/lookat.xpm
11	@dirrm share/pixmaps	32	lib/mozilla/plugins/openvrml.la
		33	lib/mozilla/plugins/openvrml.so
		34	lib/mozilla/plugins/openvrml.xpt
		35	@dirrm include/openvrml/openvrml/gl
		36	@dirrm include/openvrml/openvrml
		37	@dirrm include/openvrml
		38	@dirrm share/idl/openvrml-%%VER%%
		39	@unexec rmdir %D/share/pixmaps 2>/dev/null \|\| true