upgrade to 0.14.3

8 files changed, 77 insertions, 187 deletions

diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index ec9b3965070..85202fa7ee5 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	openvrml
-PORTVERSION=	0.12.4
-PORTREVISION=	1
+PORTVERSION=	0.14.3
+PORTREVISION=	0
 CATEGORIES=	www graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,19 +15,29 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	VRML97 runtime and browser ("lookat")
 
+BUILD_DEPENDS=	${X11BASE}/lib/firefox/lib/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/firefox
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png
+		png.5:${PORTSDIR}/graphics/png \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	${X11BASE}/lib/firefox/lib/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/firefox
 
 USE_REINPLACE=	yes
+USE_GL=		yes
 USE_MESA=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnomehack
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXext"
-CONFIGURE_ARGS=	--without-spidermonkey --without-jdk --without-doxygen
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXext" \
+		PKG_CONFIG_PATH="${X11BASE}/lib/firefox/lib/pkgconfig"
+CONFIGURE_ARGS=	--without-jdk
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	# empty, not use * 'cause args too long (for find)
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
@@ -35,6 +45,16 @@ BROKEN=		"Does not compile on !i386"
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" ${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}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${CP} -R ${WRKSRC}/doc/manual/ ${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/openvrml/distinfo b/www/openvrml/distinfo
index bed91166209..bb7a4c20ced 100644
--- a/www/openvrml/distinfo
+++ b/www/openvrml/distinfo
@@ -1,2 +1,2 @@
-MD5 (openvrml-0.12.4.tar.gz) = 5c43465d2f30e8bccbe7c64ed710a60b
-SIZE (openvrml-0.12.4.tar.gz) = 683925
+MD5 (openvrml-0.14.3.tar.gz) = 43d4015a98c7e2479e1164184da0e8e6
+SIZE (openvrml-0.14.3.tar.gz) = 2996458
diff --git a/www/openvrml/files/patch-Makefile.in b/www/openvrml/files/patch-Makefile.in
index 644930ea645..3827028f4fe 100644
--- a/www/openvrml/files/patch-Makefile.in
+++ b/www/openvrml/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Wed Oct 16 09:41:01 2002
-+++ Makefile.in	Wed Oct 16 09:43:58 2002
-@@ -113,7 +113,7 @@
+--- 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
  
- @WITH_GL_TRUE@OPENVRML_GL_PC = openvrml-gl.pc
+ ACLOCAL_AMFLAGS = -I m4
  
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = openvrml.pc $(OPENVRML_GL_PC)
- 
- pixmapdatadir = $(datadir)/pixmaps
diff --git a/www/openvrml/files/patch-field.cpp b/www/openvrml/files/patch-field.cpp
deleted file mode 100644
index 4daa0a1ca46..00000000000
--- a/www/openvrml/files/patch-field.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
---- src/openvrml/OpenVRML/field.cpp.orig	Wed Oct 16 02:20:24 2002
-+++ src/openvrml/OpenVRML/field.cpp	Wed Oct 16 02:25:12 2002
-@@ -525,7 +525,7 @@
-  *
-  * @param rgb a 3-element vector comprising a RGB value
-  */
--void SFColor::set(const float rgb[3]) throw () {
-+void SFColor::set(const float *rgb) throw () {
-     this->d_rgb[0] = rgb[0];
-     this->d_rgb[1] = rgb[1];
-     this->d_rgb[2] = rgb[2];
-@@ -543,7 +543,7 @@
-  * @param hsv a 3-element array comprising an HSV value
-  * @retval rgb a 3-element array comprising an RGB value
-  */
--void SFColor::HSVtoRGB(const float hsv[3], float rgb[3]) throw ()
-+void SFColor::HSVtoRGB(const float *hsv, float *rgb) throw ()
- {
-     float h = hsv[0];
-     if (hsv[1] == 0.0) {
-@@ -579,7 +579,7 @@
-  * @param rgb a 3-element array comprising an RGB value
-  * @retval hsv a 3-element array comprising an HSV value
-  */
--void SFColor::RGBtoHSV(const float rgb[3], float hsv[3]) throw () {
-+void SFColor::RGBtoHSV(const float *rgb, float *hsv) throw () {
-     const float maxrgb = *std::max_element(rgb, rgb + 3);
-     const float minrgb = *std::min_element(rgb, rgb + 3);
-     
-@@ -1320,7 +1320,7 @@
-  * @pre The first three elements of <var>rot</var> constitute a normalized
-  *      vector.
-  */
--void SFRotation::set(const float rot[4]) throw () {
-+void SFRotation::set(const float *rot) throw () {
-     using OpenVRML_::fpequal;
-     using OpenVRML_::length;
-     
-@@ -1789,7 +1789,7 @@
-  *
-  * @param vec a 2-element array.
-  */
--void SFVec2f::set(const float vec[2]) throw () {
-+void SFVec2f::set(const float *vec) throw () {
-     this->d_x[0] = vec[0];
-     this->d_x[1] = vec[1];
- }
-@@ -1920,7 +1920,7 @@
-  *
-  * @param vec a 3-element array
-  */
--SFVec3f::SFVec3f(const float vec[3]) throw () {
-+SFVec3f::SFVec3f(const float *vec) throw () {
-     std::copy(vec, vec + 3, this->d_x);
- }
- 
-@@ -2063,7 +2063,7 @@
-  *
-  * @param vec   a 3-element array
-  */
--void SFVec3f::set(const float vec[3]) throw () {
-+void SFVec3f::set(const float *vec) throw () {
-     this->d_x[0] = vec[0];
-     this->d_x[1] = vec[1];
-     this->d_x[2] = vec[2];
-@@ -2348,7 +2348,7 @@
-  * @param index the index of the element to set
-  * @param value a 3-element float array comprising the new color value
-  */
--void MFColor::setElement(size_t index, const float value[3]) throw () {
-+void MFColor::setElement(size_t index, const float *value) throw () {
-     assert(index < this->getLength());
-     std::copy(value, value + 3, this->d_data->d_v + (index * 3));
- }
-@@ -2396,7 +2396,7 @@
-  *
-  * @exception std::bad_alloc    if memory allocation fails.
-  */
--void MFColor::insertElement(const size_t index, const float value[3])
-+void MFColor::insertElement(const size_t index, const float *value)
-         throw (std::bad_alloc) {
-     using std::copy;
-     FData * const newData = new FData(this->d_data->d_n + 3);
-@@ -3326,7 +3326,7 @@
-  * @param index
-  * @param value
-  */
--void MFRotation::setElement(size_t index, const float value[4]) throw () {
-+void MFRotation::setElement(size_t index, const float *value) throw () {
-     assert(index * 4 < this->d_data->d_n);
-     std::copy(value, value + 4, this->d_data->d_v + (index * 4));
- }
-@@ -3376,7 +3376,7 @@
-  *
-  * @exception std::bad_alloc    if memory allocation fails.
-  */
--void MFRotation::insertElement(size_t index, const float value[4])
-+void MFRotation::insertElement(size_t index, const float *value)
-         throw (std::bad_alloc) {
-   FData* newData;
- 
-@@ -4006,7 +4006,7 @@
-  * @param index
-  * @param value
-  */
--void MFVec2f::setElement(size_t index, const float value[2]) throw () {
-+void MFVec2f::setElement(size_t index, const float *value) throw () {
-     assert((index * 2) < this->d_data->d_n);
-     std::copy(value, value + 2, this->d_data->d_v + (index * 2));
- }
-@@ -4050,7 +4050,7 @@
-  *
-  * @exception std::bad_alloc    if memory allocation fails.
-  */
--void MFVec2f::insertElement(size_t index, const float data[2])
-+void MFVec2f::insertElement(size_t index, const float *data)
-         throw (std::bad_alloc) {
-   FData* newData;
- 
-@@ -4253,7 +4253,7 @@
-  * @param index
-  * @param value
-  */
--void MFVec3f::setElement(size_t index, const float value[3]) throw () {
-+void MFVec3f::setElement(size_t index, const float *value) throw () {
-     assert((index * 3) < this->d_data->d_n);
-     std::copy(value, value + 3, this->d_data->d_v + (index * 3));
- }
-@@ -4297,7 +4297,7 @@
-  *
-  * @exception std::bad_alloc    if memory allocation fails.
-  */
--void MFVec3f::insertElement(size_t index, const float value[3])
-+void MFVec3f::insertElement(size_t index, const float *value)
-         throw (std::bad_alloc) {
-   FData* newData;
- 
diff --git a/www/openvrml/files/patch-ltmain.sh b/www/openvrml/files/patch-ltmain.sh
new file mode 100644
index 00000000000..e7be8dd9ae5
--- /dev/null
+++ b/www/openvrml/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Wed Apr  7 12:00:09 2004
++++ ltmain.sh	Wed Apr  7 12:00:20 2004
+@@ -5428,10 +5428,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false ; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/openvrml/files/patch-openvrml:Makefile.in b/www/openvrml/files/patch-openvrml:Makefile.in
new file mode 100644
index 00000000000..d21087b2ce4
--- /dev/null
+++ b/www/openvrml/files/patch-openvrml:Makefile.in
@@ -0,0 +1,11 @@
+--- 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 \
diff --git a/www/openvrml/files/patch-openvrml:gl:Makefile.in b/www/openvrml/files/patch-openvrml:gl:Makefile.in
new file mode 100644
index 00000000000..07638c0220c
--- /dev/null
+++ b/www/openvrml/files/patch-openvrml:gl:Makefile.in
@@ -0,0 +1,11 @@
+--- 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
diff --git a/www/openvrml/pkg-plist b/www/openvrml/pkg-plist
index 895a9af1522..1f3e8e0d7dc 100644
--- a/www/openvrml/pkg-plist
+++ b/www/openvrml/pkg-plist
@@ -1,40 +1,10 @@
 bin/lookat
-include/OpenVRML/GL/OpenGLEvent.h
-include/OpenVRML/GL/ViewerOpenGL.h
-include/OpenVRML/GL/common.h
-include/OpenVRML/Audio.h
-include/OpenVRML/Doc.h
-include/OpenVRML/Image.h
-include/OpenVRML/MathUtils.h
-include/OpenVRML/ScriptJDK.h
-include/OpenVRML/System.h
-include/OpenVRML/Viewer.h
-include/OpenVRML/VrmlFrustum.h
-include/OpenVRML/VrmlMatrix.h
-include/OpenVRML/VrmlNamespace.h
-include/OpenVRML/VrmlRenderContext.h
-include/OpenVRML/VrmlScene.h
-include/OpenVRML/bvolume.h
-include/OpenVRML/common.h
-include/OpenVRML/doc2.hpp
-include/OpenVRML/field.h
-include/OpenVRML/fieldvalueptr.h
-include/OpenVRML/node.h
-include/OpenVRML/nodeclassptr.h
-include/OpenVRML/nodeptr.h
-include/OpenVRML/nodetypeptr.h
-include/OpenVRML/script.h
-include/OpenVRML/vrml97node.h
-@dirrm include/OpenVRML/GL
-@dirrm include/OpenVRML
 lib/libopenvrml.a
-lib/libopenvrml.la
 lib/libopenvrml.so
-lib/libopenvrml.so.2
+lib/libopenvrml.so.4
 lib/libopenvrml-gl.a
-lib/libopenvrml-gl.la
 lib/libopenvrml-gl.so
-lib/libopenvrml-gl.so.3
+lib/libopenvrml-gl.so.5
 libdata/pkgconfig/openvrml.pc
 libdata/pkgconfig/openvrml-gl.pc
 share/pixmaps/lookat.xpm