upgrade to 0.12.4

Approved by:	maintainer timeout (almost 1 month)

5 files changed, 187 insertions, 108 deletions

diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index 327dba6397ba..44bf69f11217 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -6,24 +6,27 @@
 #
 
 PORTNAME=	openvrml
-PORTVERSION=	0.10.1
+PORTVERSION=	0.12.4
 CATEGORIES=	www graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	openvrml
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	3d@freebsd.org
+MAINTAINER=	3d@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
-CONFIGURE_ARGS=	--with-jpeg-prefix=${LOCALBASE} \
-		--with-png-prefix=${LOCALBASE} \
-		--with-MesaGL
-CONFIGURE_ENV=	LIBS="-L${X11BASE}/lib -lX11 -lXext -lm -lGL -lGLU -pthread"
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_MESA=	yes
+USE_X_PREFIX=	yes
+USE_LIBTOOL=	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
+USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/www/openvrml/distinfo b/www/openvrml/distinfo
index 544c63a51023..e3a425438088 100644
--- a/www/openvrml/distinfo
+++ b/www/openvrml/distinfo
@@ -1 +1 @@
-MD5 (openvrml-0.10.1.tar.gz) = cf305509c6749c282a16005ced88c4e4
+MD5 (openvrml-0.12.4.tar.gz) = 5c43465d2f30e8bccbe7c64ed710a60b
diff --git a/www/openvrml/files/patch-Makefile.in b/www/openvrml/files/patch-Makefile.in
new file mode 100644
index 000000000000..644930ea6455
--- /dev/null
+++ b/www/openvrml/files/patch-Makefile.in
@@ -0,0 +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 @@
+ 
+ @WITH_GL_TRUE@OPENVRML_GL_PC = openvrml-gl.pc
+ 
+-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
new file mode 100644
index 000000000000..4daa0a1ca465
--- /dev/null
+++ b/www/openvrml/files/patch-field.cpp
@@ -0,0 +1,137 @@
+--- 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/pkg-plist b/www/openvrml/pkg-plist
index 330edca63375..895a9af1522a 100644
--- a/www/openvrml/pkg-plist
+++ b/www/openvrml/pkg-plist
@@ -1,113 +1,41 @@
 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/ScriptObject.h
+include/OpenVRML/ScriptJDK.h
 include/OpenVRML/System.h
 include/OpenVRML/Viewer.h
-include/OpenVRML/VrmlAABox.h
-include/OpenVRML/VrmlBSphere.h
-include/OpenVRML/VrmlBVolume.h
-include/OpenVRML/VrmlEvent.h
-include/OpenVRML/VrmlField.h
 include/OpenVRML/VrmlFrustum.h
-include/OpenVRML/VrmlMFColor.h
-include/OpenVRML/VrmlMFFloat.h
-include/OpenVRML/VrmlMFInt32.h
-include/OpenVRML/VrmlMFNode.h
-include/OpenVRML/VrmlMFRotation.h
-include/OpenVRML/VrmlMFString.h
-include/OpenVRML/VrmlMFTime.h
-include/OpenVRML/VrmlMFVec2f.h
-include/OpenVRML/VrmlMFVec3f.h
+include/OpenVRML/VrmlMatrix.h
 include/OpenVRML/VrmlNamespace.h
-include/OpenVRML/VrmlNode.h
-include/OpenVRML/VrmlNodeAnchor.h
-include/OpenVRML/VrmlNodeAppearance.h
-include/OpenVRML/VrmlNodeAudioClip.h
-include/OpenVRML/VrmlNodeBackground.h
-include/OpenVRML/VrmlNodeBillboard.h
-include/OpenVRML/VrmlNodeBox.h
-include/OpenVRML/VrmlNodeChild.h
-include/OpenVRML/VrmlNodeCollision.h
-include/OpenVRML/VrmlNodeColor.h
-include/OpenVRML/VrmlNodeColorInt.h
-include/OpenVRML/VrmlNodeCone.h
-include/OpenVRML/VrmlNodeCoordinate.h
-include/OpenVRML/VrmlNodeCoordinateInt.h
-include/OpenVRML/VrmlNodeCylinder.h
-include/OpenVRML/VrmlNodeCylinderSensor.h
-include/OpenVRML/VrmlNodeDirLight.h
-include/OpenVRML/VrmlNodeElevationGrid.h
-include/OpenVRML/VrmlNodeExtrusion.h
-include/OpenVRML/VrmlNodeFog.h
-include/OpenVRML/VrmlNodeFontStyle.h
-include/OpenVRML/VrmlNodeGeometry.h
-include/OpenVRML/VrmlNodeGroup.h
-include/OpenVRML/VrmlNodeIFaceSet.h
-include/OpenVRML/VrmlNodeILineSet.h
-include/OpenVRML/VrmlNodeImageTexture.h
-include/OpenVRML/VrmlNodeIndexedSet.h
-include/OpenVRML/VrmlNodeInline.h
-include/OpenVRML/VrmlNodeLOD.h
-include/OpenVRML/VrmlNodeLight.h
-include/OpenVRML/VrmlNodeMaterial.h
-include/OpenVRML/VrmlNodeMovieTexture.h
-include/OpenVRML/VrmlNodeNavigationInfo.h
-include/OpenVRML/VrmlNodeNormal.h
-include/OpenVRML/VrmlNodeNormalInt.h
-include/OpenVRML/VrmlNodeOrientationInt.h
-include/OpenVRML/VrmlNodePixelTexture.h
-include/OpenVRML/VrmlNodePlaneSensor.h
-include/OpenVRML/VrmlNodePointLight.h
-include/OpenVRML/VrmlNodePointSet.h
-include/OpenVRML/VrmlNodePositionInt.h
-include/OpenVRML/VrmlNodeProto.h
-include/OpenVRML/VrmlNodeProximitySensor.h
-include/OpenVRML/VrmlNodeScalarInt.h
-include/OpenVRML/VrmlNodeScript.h
-include/OpenVRML/VrmlNodeShape.h
-include/OpenVRML/VrmlNodeSound.h
-include/OpenVRML/VrmlNodeSphere.h
-include/OpenVRML/VrmlNodeSphereSensor.h
-include/OpenVRML/VrmlNodeSpotLight.h
-include/OpenVRML/VrmlNodeSwitch.h
-include/OpenVRML/VrmlNodeText.h
-include/OpenVRML/VrmlNodeTexture.h
-include/OpenVRML/VrmlNodeTextureCoordinate.h
-include/OpenVRML/VrmlNodeTextureTransform.h
-include/OpenVRML/VrmlNodeTimeSensor.h
-include/OpenVRML/VrmlNodeTouchSensor.h
-include/OpenVRML/VrmlNodeTransform.h
-include/OpenVRML/VrmlNodeType.h
-include/OpenVRML/VrmlNodeViewpoint.h
-include/OpenVRML/VrmlNodeVisibilitySensor.h
-include/OpenVRML/VrmlNodeWorldInfo.h
 include/OpenVRML/VrmlRenderContext.h
-include/OpenVRML/VrmlSFBool.h
-include/OpenVRML/VrmlSFColor.h
-include/OpenVRML/VrmlSFFloat.h
-include/OpenVRML/VrmlSFImage.h
-include/OpenVRML/VrmlSFInt32.h
-include/OpenVRML/VrmlSFNode.h
-include/OpenVRML/VrmlSFRotation.h
-include/OpenVRML/VrmlSFString.h
-include/OpenVRML/VrmlSFTime.h
-include/OpenVRML/VrmlSFVec2f.h
-include/OpenVRML/VrmlSFVec3f.h
 include/OpenVRML/VrmlScene.h
+include/OpenVRML/bvolume.h
+include/OpenVRML/common.h
 include/OpenVRML/doc2.hpp
-include/OpenVRML/GL/ViewerOpenGL.h
+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.0
+lib/libopenvrml.so.2
 lib/libopenvrml-gl.a
+lib/libopenvrml-gl.la
 lib/libopenvrml-gl.so
-lib/libopenvrml-gl.so.0
-share/aclocal/vrml.m4
-share/aclocal/vrml-gl.m4
-share/doc/openvrml-0.10.1/conformance.html
-@dirrm include/OpenVRML/GL
-@dirrm include/OpenVRML
-@dirrm share/doc/openvrml-0.10.1
+lib/libopenvrml-gl.so.3
+libdata/pkgconfig/openvrml.pc
+libdata/pkgconfig/openvrml-gl.pc
+share/pixmaps/lookat.xpm
+@dirrm share/pixmaps