4 files changed, 57 insertions, 7 deletions

diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index c410e680c8b7..94590321b1ea 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openvrml
 PORTVERSION=	0.15.10
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	www graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,23 +15,22 @@ 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=	${LOCALBASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla	\
 		${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=	${X11BASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla
 
 USE_GL=		yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gtk20
 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,${X11BASE}/lib/mozilla -L${X11BASE}/lib -lXext" \
-		XPIDLFLAGS="-I${X11BASE}/share/idl/mozilla"
+		LDFLAGS="-L${LOCALBASE}/lib -largp -Wl,--rpath -Wl,${LOCALBASE}/lib/mozilla -L${X11BASE}/lib -lXext" \
+		XPIDLFLAGS="-I${LOCALBASE}/share/idl/mozilla"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/www/openvrml/files/lookat.sh.in b/www/openvrml/files/lookat.sh.in
index 163a887c2561..0f3d2f823315 100644
--- a/www/openvrml/files/lookat.sh.in
+++ b/www/openvrml/files/lookat.sh.in
@@ -1,4 +1,4 @@
 #! /bin/sh
 # $FreeBSD$
 
-LD_LIBRARY_PATH=%%X11BASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1
+LD_LIBRARY_PATH=%%LOCALBASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1
diff --git a/www/openvrml/files/patch-030_freetype_prototypes b/www/openvrml/files/patch-030_freetype_prototypes
new file mode 100644
index 000000000000..5f6dc6700380
--- /dev/null
+++ b/www/openvrml/files/patch-030_freetype_prototypes
@@ -0,0 +1,50 @@
+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<GlyphContours_ *>(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 --git a/www/openvrml/pkg-plist b/www/openvrml/pkg-plist
index ca4e10060b88..ac860cb3607b 100644
--- a/www/openvrml/pkg-plist
+++ b/www/openvrml/pkg-plist
@@ -59,3 +59,4 @@ lib/mozilla/plugins/openvrml.xpt
 @dirrmtry share/gtk-doc/html/gtkglext
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
+@dirrmtry share/pixmaps