Upgrade to 0.15.9 and unbreak.

Remarks:
- still broken on FreeBSD-4.11;
- to be tested on != i386;
- it now installs a plug-in for mozilla, but it only works for local
  files.

PR:		84023
Submitted by:	/me
This commit is contained in:
Thierry Thomas 2005-07-26 13:39:59 +00:00
parent 4667fefaa7
commit dce4738293
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=140154
11 changed files with 101 additions and 144 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= openvrml
PORTVERSION= 0.14.3
PORTREVISION= 3
PORTVERSION= 0.15.9
CATEGORIES= www graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -15,7 +14,9 @@ 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
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
@ -23,27 +24,39 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla
USE_REINPLACE= yes
USE_GL= yes
USE_MESA= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack
USE_GNOME= gnomehack gtk20
USE_SDL= sdl
USE_GCC= 3.4
GNU_CONFIGURE= yes
USE_LIBTOOL_VER= 15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXext"
CONFIGURE_ARGS= --without-jdk
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= # empty, not use * 'cause args too long (for find)
PORTDOCS= *
.endif
.include <bsd.port.pre.mk>
.if ${ARCH} != "i386"
BROKEN= "Does not compile on !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
BROKEN= "Does not build on i386"
LIB_DEPENDS+= boost_regex.2:${PORTSDIR}/devel/boost
.endif
post-patch:
@ -51,13 +64,13 @@ post-patch:
${WRKSRC}/configure
post-install:
@${FIND} ${PREFIX}/include/openvrml -type f | \
${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
@${FIND} ${PREFIX}/include/openvrml -type d | ${SORT} -r | \
${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${PREFIX}/bin
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
${CP} -R ${WRKSRC}/doc/manual/ ${DOCSDIR}
.endif
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.post.mk>

View File

@ -1,2 +1,2 @@
MD5 (openvrml-0.14.3.tar.gz) = 43d4015a98c7e2479e1164184da0e8e6
SIZE (openvrml-0.14.3.tar.gz) = 2996458
MD5 (openvrml-0.15.9.tar.gz) = a4134d658685be71596c620169221e6f
SIZE (openvrml-0.15.9.tar.gz) = 5523568

View File

@ -0,0 +1,4 @@
#! /bin/sh
# $FreeBSD$
LD_LIBRARY_PATH=%%X11BASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1

View File

@ -1,11 +1,11 @@
--- Makefile.in.orig Wed Apr 7 13:30:15 2004
+++ Makefile.in Wed Apr 7 13:30:30 2004
@@ -173,7 +173,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = doc ide-projects m4 models lib java src
+SUBDIRS = ide-projects m4 models lib java src
--- 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 \

View File

@ -0,0 +1,14 @@
--- 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);

View File

@ -1,11 +0,0 @@
--- src/libopenvrml/openvrml/Makefile.in.orig Wed Apr 7 13:54:36 2004
+++ src/libopenvrml/openvrml/Makefile.in Wed Apr 7 13:55:02 2004
@@ -175,7 +175,7 @@
target_alias = @target_alias@
lib_LTLIBRARIES = libopenvrml.la
-openvrml_includedir = $(pkgincludedir)/openvrml
+openvrml_includedir = $(pkgincludedir)
openvrml_include_HEADERS = \
common.h \
basetypes.h \

View File

@ -1,11 +0,0 @@
--- src/libopenvrml-gl/openvrml/gl/Makefile.in.orig Wed Apr 7 14:11:15 2004
+++ src/libopenvrml-gl/openvrml/gl/Makefile.in Wed Apr 7 14:12:00 2004
@@ -193,7 +193,7 @@
AM_CXXFLAGS = @GL_CFLAGS@
@ENABLE_GL_RENDERER_TRUE@lib_LTLIBRARIES = libopenvrml-gl.la
-@ENABLE_GL_RENDERER_TRUE@openvrml_gl_includedir = $(pkgincludedir)/openvrml/gl
+@ENABLE_GL_RENDERER_TRUE@openvrml_gl_includedir = $(pkgincludedir)/gl
@ENABLE_GL_RENDERER_TRUE@openvrml_gl_include_HEADERS = viewer.h
@ENABLE_GL_RENDERER_TRUE@libopenvrml_gl_la_SOURCES = viewer.cpp

View File

@ -1,85 +0,0 @@
$FreeBSD$
--- 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();

View File

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

5
www/openvrml/pkg-message Normal file
View File

@ -0,0 +1,5 @@
===========================================
Please run lookat via the script lookat.sh:
lookat.sh sample.wrl
===========================================

View File

@ -1,11 +1,39 @@
bin/lookat
lib/libopenvrml.a
lib/libopenvrml.so
lib/libopenvrml.so.4
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.5
libdata/pkgconfig/openvrml.pc
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
@dirrm share/pixmaps
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