aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/wildmagic/Makefile11
-rw-r--r--graphics/wildmagic/distinfo6
-rw-r--r--graphics/wildmagic/pkg-plist72
3 files changed, 39 insertions, 50 deletions
diff --git a/graphics/wildmagic/Makefile b/graphics/wildmagic/Makefile
index f3692925dce7..c4eaf8d5de1e 100644
--- a/graphics/wildmagic/Makefile
+++ b/graphics/wildmagic/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= WildMagic
-DISTVERSION= 4p8
-PORTREVISION= 1
+DISTVERSION= 4p9
CATEGORIES= graphics
MASTER_SITES= http://www.geometrictools.com/Downloads/
DISTNAME= ${PORTNAME}${DISTVERSION}
@@ -32,16 +31,8 @@ MAKE_ENV= GCC=${CXX} AR=${AR} EGL=${EGL} EGL0=glx EGL1=Glx \
XLIBS="-lX11 -lXext" GLIBS="-lGL -lGLU"
PLIST_SUB= CFG=${CONFIG} GRF=${GRF} WM=Wm${MV}
-.if defined(WITH_OPENGL)
-GRF= OpenGL
-EGL= Glx
-PLIST_SUB+= OGL="" SOFT="@comment "
-IGNORE= this version does not run with OpenGL
-.else
GRF= Soft
EGL= XSoft
-PLIST_SUB+= OGL="@comment " SOFT=""
-.endif
MV= ${PORTVERSION:R}
SAMPLEDIRS= SampleFoundation SampleGraphics SampleImagics SamplePhysics
diff --git a/graphics/wildmagic/distinfo b/graphics/wildmagic/distinfo
index d17e3e6e06fe..b51fb3a0a96a 100644
--- a/graphics/wildmagic/distinfo
+++ b/graphics/wildmagic/distinfo
@@ -1,3 +1,3 @@
-MD5 (WildMagic4p8.zip) = 591818e1fac323511229742c2b9cb5a9
-SHA256 (WildMagic4p8.zip) = a6fc3f8a0ebe28abff0ca2d928bb099830787fd8c385b72c86508fc9d7d47308
-SIZE (WildMagic4p8.zip) = 24941743
+MD5 (WildMagic4p9.zip) = 8a6773f4fc576869d3e74adab12367bc
+SHA256 (WildMagic4p9.zip) = 67aa9befdfddbec3664bfc36eab645fef39c364f6a02c56dee62f7f8012bda41
+SIZE (WildMagic4p9.zip) = 24963612
diff --git a/graphics/wildmagic/pkg-plist b/graphics/wildmagic/pkg-plist
index 71580bcc4a46..115edac81fcb 100644
--- a/graphics/wildmagic/pkg-plist
+++ b/graphics/wildmagic/pkg-plist
@@ -255,7 +255,6 @@ include/%%WM%%/%%WM%%FrameBuffer.h
include/%%WM%%/%%WM%%FrameBuffer.inl
include/%%WM%%/%%WM%%Frustum3.h
include/%%WM%%/%%WM%%Frustum3.inl
-%%OGL%%include/%%WM%%/%%WM%%GlxRenderer.h
include/%%WM%%/%%WM%%GMatrix.h
include/%%WM%%/%%WM%%GMatrix.inl
include/%%WM%%/%%WM%%GVector.h
@@ -341,6 +340,9 @@ include/%%WM%%/%%WM%%IntrLinComp2Triangle2.h
include/%%WM%%/%%WM%%IntrLine2Arc2.h
include/%%WM%%/%%WM%%IntrLine2Box2.h
include/%%WM%%/%%WM%%IntrLine2Circle2.h
+include/%%WM%%/%%WM%%IntrLine2Line2.h
+include/%%WM%%/%%WM%%IntrLine2Ray2.h
+include/%%WM%%/%%WM%%IntrLine2Segment2.h
include/%%WM%%/%%WM%%IntrLine3Box3.h
include/%%WM%%/%%WM%%IntrLine3Capsule3.h
include/%%WM%%/%%WM%%IntrLine3Cone3.h
@@ -363,6 +365,8 @@ include/%%WM%%/%%WM%%IntrPlane3Triangle3.h
include/%%WM%%/%%WM%%IntrRay2Arc2.h
include/%%WM%%/%%WM%%IntrRay2Box2.h
include/%%WM%%/%%WM%%IntrRay2Circle2.h
+include/%%WM%%/%%WM%%IntrRay2Ray2.h
+include/%%WM%%/%%WM%%IntrRay2Segment2.h
include/%%WM%%/%%WM%%IntrRay3Box3.h
include/%%WM%%/%%WM%%IntrRay3Capsule3.h
include/%%WM%%/%%WM%%IntrRay3Cylinder3.h
@@ -374,6 +378,7 @@ include/%%WM%%/%%WM%%IntrRay3Triangle3.h
include/%%WM%%/%%WM%%IntrSegment2Arc2.h
include/%%WM%%/%%WM%%IntrSegment2Box2.h
include/%%WM%%/%%WM%%IntrSegment2Circle2.h
+include/%%WM%%/%%WM%%IntrSegment2Segment2.h
include/%%WM%%/%%WM%%IntrSegment3Box3.h
include/%%WM%%/%%WM%%IntrSegment3Capsule3.h
include/%%WM%%/%%WM%%IntrSegment3Cylinder3.h
@@ -471,12 +476,6 @@ include/%%WM%%/%%WM%%OdeImplicitEuler.h
include/%%WM%%/%%WM%%OdeMidpoint.h
include/%%WM%%/%%WM%%OdeRungeKutta4.h
include/%%WM%%/%%WM%%OdeSolver.h
-%%OGL%%include/%%WM%%/%%WM%%OpenGLBitmapFont.h
-%%OGL%%include/%%WM%%/%%WM%%OpenGLFrameBuffer.h
-%%OGL%%include/%%WM%%/%%WM%%OpenGLRenderer.h
-%%OGL%%include/%%WM%%/%%WM%%OpenGLRendererLIB.h
-%%OGL%%include/%%WM%%/%%WM%%OpenGLRendererPCH.h
-%%OGL%%include/%%WM%%/%%WM%%OpenGLResources.h
include/%%WM%%/%%WM%%ParametricSurface.h
include/%%WM%%/%%WM%%ParticleController.h
include/%%WM%%/%%WM%%ParticleController.inl
@@ -538,7 +537,6 @@ include/%%WM%%/%%WM%%Quaternion.h
include/%%WM%%/%%WM%%Quaternion.inl
include/%%WM%%/%%WM%%QuaternionArray.h
include/%%WM%%/%%WM%%Query.h
-include/%%WM%%/%%WM%%Query.inl
include/%%WM%%/%%WM%%Query2.h
include/%%WM%%/%%WM%%Query2.inl
include/%%WM%%/%%WM%%Query2Filtered.h
@@ -608,28 +606,28 @@ include/%%WM%%/%%WM%%SkinController.h
include/%%WM%%/%%WM%%SkinController.inl
include/%%WM%%/%%WM%%SmartPointer.h
include/%%WM%%/%%WM%%SmartPointer.inl
-%%SOFT%%include/%%WM%%/%%WM%%SoftArray.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftArray.inl
-%%SOFT%%include/%%WM%%/%%WM%%SoftFrameBuffer.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftFrameBuffer.inl
-%%SOFT%%include/%%WM%%/%%WM%%SoftRenderer.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftRenderer.inl
-%%SOFT%%include/%%WM%%/%%WM%%SoftRendererLIB.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftRendererPCH.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftResources.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftSampler.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftSampler1.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftSampler2.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftSampler2.inl
-%%SOFT%%include/%%WM%%/%%WM%%SoftSampler3.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftSampler3.inl
-%%SOFT%%include/%%WM%%/%%WM%%SoftSamplerCube.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftSamplerProj.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftSamplerProj.inl
-%%SOFT%%include/%%WM%%/%%WM%%SoftShaderLibrary.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftShaderLibraryMCR.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftShaderUtility.h
-%%SOFT%%include/%%WM%%/%%WM%%SoftUtilityMCR.h
+include/%%WM%%/%%WM%%SoftArray.h
+include/%%WM%%/%%WM%%SoftArray.inl
+include/%%WM%%/%%WM%%SoftFrameBuffer.h
+include/%%WM%%/%%WM%%SoftFrameBuffer.inl
+include/%%WM%%/%%WM%%SoftRenderer.h
+include/%%WM%%/%%WM%%SoftRenderer.inl
+include/%%WM%%/%%WM%%SoftRendererLIB.h
+include/%%WM%%/%%WM%%SoftRendererPCH.h
+include/%%WM%%/%%WM%%SoftResources.h
+include/%%WM%%/%%WM%%SoftSampler.h
+include/%%WM%%/%%WM%%SoftSampler1.h
+include/%%WM%%/%%WM%%SoftSampler2.h
+include/%%WM%%/%%WM%%SoftSampler2.inl
+include/%%WM%%/%%WM%%SoftSampler3.h
+include/%%WM%%/%%WM%%SoftSampler3.inl
+include/%%WM%%/%%WM%%SoftSamplerCube.h
+include/%%WM%%/%%WM%%SoftSamplerProj.h
+include/%%WM%%/%%WM%%SoftSamplerProj.inl
+include/%%WM%%/%%WM%%SoftShaderLibrary.h
+include/%%WM%%/%%WM%%SoftShaderLibraryMCR.h
+include/%%WM%%/%%WM%%SoftShaderUtility.h
+include/%%WM%%/%%WM%%SoftUtilityMCR.h
include/%%WM%%/%%WM%%Spatial.h
include/%%WM%%/%%WM%%Spatial.inl
include/%%WM%%/%%WM%%Sphere3.h
@@ -760,14 +758,8 @@ include/%%WM%%/%%WM%%WindowApplication.inl
include/%%WM%%/%%WM%%WindowApplication2.h
include/%%WM%%/%%WM%%WindowApplication3.h
include/%%WM%%/%%WM%%WireframeState.h
-%%SOFT%%include/%%WM%%/%%WM%%XSoftRenderer.h
+include/%%WM%%/%%WM%%XSoftRenderer.h
include/%%WM%%/%%WM%%ZBufferState.h
-lib/lib%%WM%%%%GRF%%Application.a
-lib/lib%%WM%%%%GRF%%Application.so
-lib/lib%%WM%%%%GRF%%Application.so.0
-lib/lib%%WM%%%%GRF%%Renderer.a
-lib/lib%%WM%%%%GRF%%Renderer.so
-lib/lib%%WM%%%%GRF%%Renderer.so.0
lib/lib%%WM%%Foundation.a
lib/lib%%WM%%Foundation.so
lib/lib%%WM%%Foundation.so.0
@@ -780,6 +772,12 @@ lib/lib%%WM%%Imagics.so.0
lib/lib%%WM%%Physics.a
lib/lib%%WM%%Physics.so
lib/lib%%WM%%Physics.so.0
+lib/lib%%WM%%%%GRF%%Application.a
+lib/lib%%WM%%%%GRF%%Application.so
+lib/lib%%WM%%%%GRF%%Application.so.0
+lib/lib%%WM%%%%GRF%%Renderer.a
+lib/lib%%WM%%%%GRF%%Renderer.so
+lib/lib%%WM%%%%GRF%%Renderer.so.0
%%DATADIR%%/Data/Im/Binary.im
%%DATADIR%%/Data/Im/Head.im
%%DATADIR%%/Data/Im/Molecule.im