diff -urN www/openvrml.orig/Makefile www/openvrml/Makefile --- www/openvrml.orig/Makefile Sun May 20 21:50:26 2007 +++ www/openvrml/Makefile Tue Jun 5 23:05:04 2007 @@ -6,43 +6,52 @@ # PORTNAME= openvrml -PORTVERSION= 0.15.10 -PORTREVISION= 6 +PORTVERSION= 0.16.5 CATEGORIES= www graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -COMMENT= VRML97 runtime and browser ("lookat") +COMMENT= VRML97 runtime and browser -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla \ - ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \ +BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \ pkg-config:${PORTSDIR}/devel/pkg-config -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla +LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \ + fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + png.5:${PORTSDIR}/graphics/png \ + curl.4:${PORTSDIR}/ftp/curl USE_GL= yes -USE_GNOME= gnomehack gtk20 +USE_GNOME= gnomehack libglade2 libgnomeui USE_SDL= sdl -USE_GCC= 3.4 USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -largp -Wl,--rpath -Wl,${LOCALBASE}/lib/mozilla -L${X11BASE}/lib -lXext" \ - XPIDLFLAGS="-I${LOCALBASE}/share/idl/mozilla" +LIBTOOLFILES= configure mozilla-plugin/configure lib/gtkglext/configure +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${JNI_INC}" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${JNI_LIB} ${PTHREAD_LIBS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LDCONFIG= yes +USE_GECKO= firefox seamonkey -PLIST_SUB= VER=${PORTVERSION} -SUB_FILES= lookat.sh +.if defined(WITH_JAVA) +IGNORE= script node Java support is not really supported is this release +BUILD_DEPENDS+= antlr:${PORTSDIR}/devel/antlr +USE_JAVA= yes +JNI_INC= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L} +JNI_LIB= -L${JAVA_HOME}/jre/lib/${ARCH}/client +.else +CONFIGURE_ARGS+=--disable-script-node-java +.endif + +PLIST_SUB= PLUGINS_DIR=${BROWSER_PLUGINS_DIR:S|^${LOCALBASE}/||} .if !defined(NOPORTDOCS) PORTDOCS= * .endif .include +.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" .if ${OSVERSION} >= 700029 BROKEN= Incorrect objformat handling @@ -53,31 +62,47 @@ .endif .if exists(${LOCALBASE}/include/boost/python.hpp) -LIB_DEPENDS+= boost_python.3:${PORTSDIR}/devel/boost-python +LIB_DEPENDS+= boost_thread.3:${PORTSDIR}/devel/boost-python .else -LIB_DEPENDS+= boost_regex.3:${PORTSDIR}/devel/boost +LIB_DEPENDS+= boost_thread.3:${PORTSDIR}/devel/boost .endif -post-patch: - @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ +pre-everything:: + @${ECHO_MSG} + @${ECHO_MSG} "Warning: building this port eats more than 750Mb of RAM;" + @${ECHO_MSG} "Do not try to build it on a small configuration!" + @${ECHO_MSG} + +pre-configure: + ${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ + ${WRKSRC}/configure ${WRKSRC}/mozilla-plugin/configure + ${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${BROWSER_PLUGINS_DIR}|' \ + ${WRKSRC}/mozilla-plugin/src/Makefile.in +.if ${GECKO} != "firefox" + ${REINPLACE_CMD} -e "s|firefox-plugin|${GECKO}-plugin|g" \ + ${WRKSRC}/mozilla-plugin/configure +.endif +.if defined(WITH_JAVA) + ${REINPLACE_CMD} -e 's|JNI_LIBS="|JNI_LIBS="-L${JAVA_HOME}/jre/lib/${ARCH}/client -Wl,-rpath,${JAVA_HOME}/jre/lib/${ARCH}/client |' \ ${WRKSRC}/configure +.endif post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${PREFIX}/bin +# ${INSTALL_DATA} ${WRKSRC}/lib/gtkglext/gtk/.libs/libgtkglext-x11-1.0.so.0 \ +# ${WRKSRC}/lib/gtkglext/gdk/.libs/libgdkglext-x11-1.0.so.0 ${PREFIX}/lib +#.for ml in gtk gdk +# (cd ${PREFIX}/lib && \ +# ${LN} -sf lib${ml}glext-x11-1.0.so.0 lib${ml}glext-x11-1.0.so) +#.endfor .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${CP} -R ${WRKSRC}/doc/manual/ ${DOCSDIR} @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/models/*.wrl ${EXAMPLESDIR} .endif - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} -.if defined(MAINTAINER_MODE) -test: build - (cd ${WRKSRC}/tests ; \ - ./testsuite ) -.endif +regression-test: + (cd ${BUILD_WRKSRC}/tests ; \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check-TESTS) .include diff -urN www/openvrml.orig/distinfo www/openvrml/distinfo --- www/openvrml.orig/distinfo Fri Nov 25 20:02:03 2005 +++ www/openvrml/distinfo Sat Jun 2 13:25:49 2007 @@ -1,3 +1,3 @@ -MD5 (openvrml-0.15.10.tar.gz) = 9ed3fa9da6f74e2a0bf45cdab655db30 -SHA256 (openvrml-0.15.10.tar.gz) = a91dca66e83b921c7a06ad7986d6f58a3d27db30250081aff745e84db9f5960f -SIZE (openvrml-0.15.10.tar.gz) = 5334341 +MD5 (openvrml-0.16.5.tar.gz) = 5d4f92de3ad50b419a8e4e139ce6f2dc +SHA256 (openvrml-0.16.5.tar.gz) = 0f8343ae2827de4c9f73380e9e49bf48edc17d938b56225e8a34404d69d90208 +SIZE (openvrml-0.16.5.tar.gz) = 5399630 diff -urN www/openvrml.orig/files/lookat.sh.in www/openvrml/files/lookat.sh.in --- www/openvrml.orig/files/lookat.sh.in Sat Oct 14 10:53:36 2006 +++ www/openvrml/files/lookat.sh.in Thu Jan 1 01:00:00 1970 @@ -1,4 +0,0 @@ -#! /bin/sh -# $FreeBSD: ports/www/openvrml/files/lookat.sh.in,v 1.2 2006/10/14 08:53:36 marcus Exp $ - -LD_LIBRARY_PATH=%%LOCALBASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1 diff -urN www/openvrml.orig/files/patch-030_freetype_prototypes www/openvrml/files/patch-030_freetype_prototypes --- www/openvrml.orig/files/patch-030_freetype_prototypes Sat Oct 14 10:53:36 2006 +++ www/openvrml/files/patch-030_freetype_prototypes Thu Jan 1 01:00:00 1970 @@ -1,50 +0,0 @@ -Index: openvrml-0.15.10/src/libopenvrml/openvrml/vrml97node.cpp -=================================================================== ---- src/libopenvrml/openvrml/vrml97node.cpp.orig 2006-06-11 14:23:00.000000000 +0200 -+++ src/libopenvrml/openvrml/vrml97node.cpp 2006-06-11 15:12:02.000000000 +0200 -@@ -16604,7 +16604,7 @@ - - const float stepSize_ = 0.2; - -- int moveTo_(FT_Vector * const to, void * const user) throw () -+ int moveTo_(const FT_Vector * to, void * user) - { - using std::vector; - assert(user); -@@ -16620,7 +16620,7 @@ - return 0; - } - -- int lineTo_(FT_Vector * const to, void * const user) throw () -+ int lineTo_(const FT_Vector * to, void * user) - { - assert(user); - GlyphContours_ & c = *static_cast(user); -@@ -16682,10 +16682,9 @@ - } - } - -- int conicTo_(FT_Vector * const control, -- FT_Vector * const to, -+ int conicTo_(const FT_Vector * control, -+ const FT_Vector * to, - void * const user) -- throw () - { - using std::vector; - -@@ -16716,11 +16715,10 @@ - return 0; - } - -- int cubicTo_(FT_Vector * const control1, -- FT_Vector * const control2, -- FT_Vector * const to, -+ int cubicTo_(const FT_Vector * control1, -+ const FT_Vector * control2, -+ const FT_Vector * to, - void * const user) -- throw () - { - using std::vector; - diff -urN www/openvrml.orig/files/patch-Makefile.in www/openvrml/files/patch-Makefile.in --- www/openvrml.orig/files/patch-Makefile.in Tue Jul 26 15:39:59 2005 +++ www/openvrml/files/patch-Makefile.in Sat Jun 2 16:11:43 2007 @@ -1,11 +1,11 @@ ---- 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@ +--- Makefile.in.orig Sat Jun 2 16:07:27 2007 ++++ Makefile.in Sat Jun 2 16:11:19 2007 +@@ -252,7 +252,7 @@ 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 + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = doc ide-projects m4 models lib java src mozilla-plugin examples tests ++SUBDIRS = ide-projects m4 models lib java src mozilla-plugin examples tests ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ openvrml.pc.in \ diff -urN www/openvrml.orig/files/patch-mozilla-plugin_src_openvrml-player_player.cpp www/openvrml/files/patch-mozilla-plugin_src_openvrml-player_player.cpp --- www/openvrml.orig/files/patch-mozilla-plugin_src_openvrml-player_player.cpp Tue Nov 15 10:34:34 2005 +++ www/openvrml/files/patch-mozilla-plugin_src_openvrml-player_player.cpp Thu Jan 1 01:00:00 1970 @@ -1,19 +0,0 @@ ---- mozilla-plugin/src/openvrml-player/player.cpp.orig Tue Nov 15 00:16:02 2005 -+++ mozilla-plugin/src/openvrml-player/player.cpp Tue Nov 15 00:21:07 2005 -@@ -22,14 +22,14 @@ - # include - # include - # include -+# include -+# include - # include - # include - # include - # include - # include - # include --# include --# include - - namespace { - diff -urN www/openvrml.orig/files/patch-src_openvrml-xembed_Makefile.in www/openvrml/files/patch-src_openvrml-xembed_Makefile.in --- www/openvrml.orig/files/patch-src_openvrml-xembed_Makefile.in Thu Jan 1 01:00:00 1970 +++ www/openvrml/files/patch-src_openvrml-xembed_Makefile.in Sun Jun 3 10:25:37 2007 @@ -0,0 +1,12 @@ +--- ./src/openvrml-xembed/Makefile.in.orig Fri Jun 1 08:56:46 2007 ++++ ./src/openvrml-xembed/Makefile.in Sun Jun 3 10:25:12 2007 +@@ -260,7 +260,8 @@ + LDADD = $(top_builddir)/src/libopenvrml-gl/libopenvrml-gl.la \ + $(top_builddir)/src/libopenvrml/libopenvrml.la \ + $(top_builddir)/lib/gtkglext/gtk/libgtkglext-x11-1.0.la \ +- $(top_builddir)/lib/gtkglext/gdk/libgdkglext-x11-1.0.la ++ $(top_builddir)/lib/gtkglext/gdk/libgdkglext-x11-1.0.la \ ++ $(JNI_LIBS) + + noinst_HEADERS = \ + bounded_buffer.h \ diff -urN www/openvrml.orig/files/patch-tests_Makefile.in www/openvrml/files/patch-tests_Makefile.in --- www/openvrml.orig/files/patch-tests_Makefile.in Thu Jan 1 01:00:00 1970 +++ www/openvrml/files/patch-tests_Makefile.in Sun Jun 3 09:34:30 2007 @@ -0,0 +1,11 @@ +--- tests/Makefile.in.orig Fri Jun 1 08:56:46 2007 ++++ tests/Makefile.in Sun Jun 3 09:34:02 2007 +@@ -184,7 +184,7 @@ + JS_LIBS = @JS_LIBS@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ @JNI_LIBS@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ diff -urN www/openvrml.orig/pkg-descr www/openvrml/pkg-descr --- www/openvrml.orig/pkg-descr Tue Jul 26 15:39:59 2005 +++ www/openvrml/pkg-descr Sat Jun 2 22:47:42 2007 @@ -1,8 +1,6 @@ -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. A plug-in for mozilla is included. +OpenVRML is a free cross-platform runtime for VRML and X3D available under the +GNU Lesser General Public License. The OpenVRML distribution includes libraries +you can use to add VRML/X3D support to an application. OpenVRML also provides a +plug-in to render VRML/X3D worlds in Web browsers. WWW: http://openvrml.sourceforge.net/ diff -urN www/openvrml.orig/pkg-message www/openvrml/pkg-message --- www/openvrml.orig/pkg-message Tue Jul 26 15:39:59 2005 +++ www/openvrml/pkg-message Thu Jan 1 01:00:00 1970 @@ -1,5 +0,0 @@ -=========================================== -Please run lookat via the script lookat.sh: - -lookat.sh sample.wrl -=========================================== diff -urN www/openvrml.orig/pkg-plist www/openvrml/pkg-plist --- www/openvrml.orig/pkg-plist Sun May 20 21:50:26 2007 +++ www/openvrml/pkg-plist Wed Jun 6 00:24:57 2007 @@ -1,23 +1,39 @@ -bin/lookat -bin/lookat.sh +bin/openvrml-player +include/openvrml/openvrml-common.h +include/openvrml/openvrml-config.h +include/openvrml/openvrml-gl-common.h +include/openvrml/openvrml-gl-config.h 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/node_impl_util.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 +include/openvrml/openvrml/x3d_cad_geometry.h +include/openvrml/openvrml/x3d_core.h +include/openvrml/openvrml/x3d_dis.h +include/openvrml/openvrml/x3d_environmental_effects.h +include/openvrml/openvrml/x3d_event_utilities.h +include/openvrml/openvrml/x3d_geometry2d.h +include/openvrml/openvrml/x3d_geospatial.h +include/openvrml/openvrml/x3d_grouping.h +include/openvrml/openvrml/x3d_hanim.h +include/openvrml/openvrml/x3d_interpolation.h +include/openvrml/openvrml/x3d_key_device_sensor.h +include/openvrml/openvrml/x3d_networking.h +include/openvrml/openvrml/x3d_nurbs.h +include/openvrml/openvrml/x3d_rendering.h +include/openvrml/openvrml/x3d_shape.h +include/openvrml/openvrml/x3d_texturing.h lib/libopenvrml-gl.a lib/libopenvrml-gl.la lib/libopenvrml-gl.so @@ -25,14 +41,13 @@ lib/libopenvrml.a lib/libopenvrml.la lib/libopenvrml.so -lib/libopenvrml.so.5 +lib/libopenvrml.so.7 +%%PLUGINS_DIR%%/openvrml.a +%%PLUGINS_DIR%%/openvrml.la +%%PLUGINS_DIR%%/openvrml.so 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.so -lib/mozilla/plugins/openvrml.xpt +libexec/openvrml-xembed %%PORTDOCS%%%%EXAMPLESDIR%%/Anchor.wrl %%PORTDOCS%%%%EXAMPLESDIR%%/Click.wrl %%PORTDOCS%%%%EXAMPLESDIR%%/EventPROTO.wrl @@ -51,10 +66,12 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/scale.wrl %%PORTDOCS%%%%EXAMPLESDIR%%/snoman.wrl %%PORTDOCS%%%%EXAMPLESDIR%%/warbird.wrl +share/openvrml-player/glade/openvrml-player.glade +@dirrm share/openvrml-player/glade +@dirrm share/openvrml-player @dirrm include/openvrml/openvrml/gl @dirrm include/openvrml/openvrml @dirrm include/openvrml -@dirrm share/idl/openvrml-%%VER%% %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrmtry share/gtk-doc/html/gtkglext @dirrmtry share/gtk-doc/html