10 files changed, 195 insertions, 4 deletions

diff --git a/graphics/wildmagic/Makefile b/graphics/wildmagic/Makefile
index 3e52981e128c..106564735edf 100644
--- a/graphics/wildmagic/Makefile
+++ b/graphics/wildmagic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	WildMagic
 DISTVERSION=	4p4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.geometrictools.com/Downloads/
 DISTNAME=	${PORTNAME}${DISTVERSION}
@@ -18,6 +19,7 @@ USE_ZIP=	yes
 USE_DOS2UNIX=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/GeometricTools/${PORTNAME}${MV}
 DOS2UNIX_REGEX=	.*\.(wm${MV}|h|inl)
@@ -43,7 +45,9 @@ PLIST_SUB+=	OGL="@comment " SOFT=""
 
 MV=		${PORTVERSION:R}
 SAMPLEDIRS=	SampleFoundation SampleGraphics SampleImagics SamplePhysics
+SOLIBS=		Foundation Graphics Imagics Physics ${GRF}Application ${GRF}Renderer
 
+CFLAGS+=	-fPIC
 .if defined(WITH_DEBUG)
 CONFIG=		Debug
 CFLAGS+=	-D_DEBUG
@@ -70,8 +74,13 @@ post-build:
 
 do-install:
 	${MKDIR} ${PREFIX}/include/Wm${MV} ${DATADIR}
-	${FIND} ${WRKSRC}/SDK/Library/Release -name "libWm*" -exec	\
-		${INSTALL_DATA} {} ${PREFIX}/lib \;
+.for li in ${SOLIBS}
+	${INSTALL_DATA} ${WRKSRC}/SDK/Library/${CONFIG}/libWm${MV}${li}.a	\
+		${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/SDK/Library/${CONFIG}/libWm${MV}${li}.so.0	\
+		${PREFIX}/lib
+	(cd ${PREFIX}/lib && ${LN} -sf libWm${MV}${li}.so.0 libWm${MV}${li}.so)
+.endfor
 	${FIND} ${WRKSRC}/SDK/Include  -name "Wm*" -exec	\
 		${INSTALL_DATA} {} ${PREFIX}/include/Wm${MV} \;
 	${CP} -R ${WRKSRC}/Data ${DATADIR}
diff --git a/graphics/wildmagic/files/patch-LibApplications_OpenGLApplication_makefile.wm4 b/graphics/wildmagic/files/patch-LibApplications_OpenGLApplication_makefile.wm4
new file mode 100644
index 000000000000..d190014452ed
--- /dev/null
+++ b/graphics/wildmagic/files/patch-LibApplications_OpenGLApplication_makefile.wm4
@@ -0,0 +1,19 @@
+--- LibApplications/OpenGLApplication/makefile.wm4.orig	Wed May 30 23:35:15 2007
++++ LibApplications/OpenGLApplication/makefile.wm4	Wed May 30 23:41:15 2007
+@@ -55,10 +55,15 @@
+ OBJDIR := $(CFG)
+ OBJ := $(SRC:%.cpp=$(CFG)/%.o)
+ LIB := ../../SDK/Library/$(CFG)/libWm4OpenGLApplication.a
++LIBSH := ../../SDK/Library/$(CFG)/libWm4OpenGLApplication.so.0
++LIBSO := ../../SDK/Library/$(CFG)/libWm4OpenGLApplication.so
++SHLIBLDFLAGS = -shared
+ 
+ build : $(OBJ)
+ 	$(AR) $(ARFLAGS) $(LIB) $(OBJ)
+-	cp -fp $(INC) $(INCDIR) 
++	$(CC) $(SHLIBLDFLAGS) -o $(LIBSH) $(OBJ)
++	ln -sf $(LIBSH) $(LIBSO)
++	cp -fp $(INC) $(INCDIR)
+ 
+ $(CFG)/TreeControl.o : TreeControl/TreeControl.cpp
+ 	@mkdir -p $(CFG)
diff --git a/graphics/wildmagic/files/patch-LibApplications_SoftApplication_makefile.wm4 b/graphics/wildmagic/files/patch-LibApplications_SoftApplication_makefile.wm4
new file mode 100644
index 000000000000..d8c3f7c74cb0
--- /dev/null
+++ b/graphics/wildmagic/files/patch-LibApplications_SoftApplication_makefile.wm4
@@ -0,0 +1,19 @@
+--- LibApplications/SoftApplication/makefile.wm4.orig	Fri Jun  1 07:13:46 2007
++++ LibApplications/SoftApplication/makefile.wm4	Fri Jun  1 07:15:25 2007
+@@ -56,10 +56,15 @@
+ endif
+ OBJ := $(SRC:%.cpp=$(CFG)/%.o)
+ LIB := ../../SDK/Library/$(CFG)/libWm4SoftApplication.a
++LIBSH := ../../SDK/Library/$(CFG)/libWm4SoftApplication.so.0
++LIBSO := ../../SDK/Library/$(CFG)/libWm4SoftApplication.so
++SHLIBLDFLAGS = -shared
+ 
+ build : $(OBJ)
+ 	$(AR) $(ARFLAGS) $(LIB) $(OBJ)
+-	cp -fp $(INC) $(INCDIR) 
++	$(CC) $(SHLIBLDFLAGS) -o $(LIBSH) $(OBJ)
++	ln -sf $(LIBSH) $(LIBSO)
++	cp -fp $(INC) $(INCDIR)
+ 
+ $(CFG)/TreeControl.o : TreeControl/TreeControl.cpp
+ 	@mkdir -p $(CFG)
diff --git a/graphics/wildmagic/files/patch-LibFoundation_makefile.wm4 b/graphics/wildmagic/files/patch-LibFoundation_makefile.wm4
new file mode 100644
index 000000000000..adc4cdcd663b
--- /dev/null
+++ b/graphics/wildmagic/files/patch-LibFoundation_makefile.wm4
@@ -0,0 +1,20 @@
+--- LibFoundation/makefile.wm4.orig	Thu May 31 18:08:02 2007
++++ LibFoundation/makefile.wm4	Thu May 31 18:12:40 2007
+@@ -1,3 +1,8 @@
++OBJDIR := $(CFG)
++LIBSH := ../SDK/Library/$(CFG)/libWm4Foundation.so.0
++LIBSO := ../SDK/Library/$(CFG)/libWm4Foundation.so
++SHLIBLDFLAGS = -shared
++
+ build :
+ 	@mkdir -p ../SDK/Include
+ 	@mkdir -p ../SDK/Library/$(CFG)
+@@ -16,6 +21,8 @@
+ 	cd NumericalAnalysis     ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
+ 	cd Surfaces              ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
+ 	cd System                ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
++	$(CC) $(SHLIBLDFLAGS) -o $(LIBSH) $(OBJDIR)/*.o
++	ln -sf $(LIBSH) $(LIBSO)
+ 
+ clean :
+ 	cd Approximation         ; make clean -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
diff --git a/graphics/wildmagic/files/patch-LibGraphics_makefile b/graphics/wildmagic/files/patch-LibGraphics_makefile
new file mode 100644
index 000000000000..4cf4eee7eb87
--- /dev/null
+++ b/graphics/wildmagic/files/patch-LibGraphics_makefile
@@ -0,0 +1,20 @@
+--- LibGraphics/makefile.wm4.orig	Thu May 31 18:08:02 2007
++++ LibGraphics/makefile.wm4	Thu May 31 18:15:10 2007
+@@ -1,3 +1,8 @@
++OBJDIR := $(CFG)
++LIBSH := ../SDK/Library/$(CFG)/libWm4Graphics.so.0
++LIBSO := ../SDK/Library/$(CFG)/libWm4Graphics.so
++SHLIBLDFLAGS = -shared
++
+ build :
+ 	@mkdir -p ../SDK/Include
+ 	@mkdir -p ../SDK/Library/$(CFG)
+@@ -17,6 +22,8 @@
+ 	cd Sorting            ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
+ 	cd Surfaces           ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
+ 	cd Terrain            ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
++	$(CC) $(SHLIBLDFLAGS) -o $(LIBSH) $(OBJDIR)/*.o
++	ln -sf $(LIBSH) $(LIBSO)
+ 
+ clean :
+ 	cd Collision          ; make clean -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
diff --git a/graphics/wildmagic/files/patch-LibImagics_makefile.wm4 b/graphics/wildmagic/files/patch-LibImagics_makefile.wm4
new file mode 100644
index 000000000000..a829c835108a
--- /dev/null
+++ b/graphics/wildmagic/files/patch-LibImagics_makefile.wm4
@@ -0,0 +1,20 @@
+--- LibImagics/makefile.wm4.orig	Thu May 31 18:08:03 2007
++++ LibImagics/makefile.wm4	Thu May 31 18:17:40 2007
+@@ -1,3 +1,8 @@
++OBJDIR := $(CFG)
++LIBSH := ../SDK/Library/$(CFG)/libWm4Imagics.so.0
++LIBSO := ../SDK/Library/$(CFG)/libWm4Imagics.so
++SHLIBLDFLAGS = -shared
++
+ build :
+ 	@mkdir -p ../SDK/Include
+ 	@mkdir -p ../SDK/Library/$(CFG)
+@@ -9,6 +14,8 @@
+ 	cd Images            ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
+ 	cd RasterDrawing     ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
+ 	cd Segmenters        ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
++	$(CC) $(SHLIBLDFLAGS) -o $(LIBSH) $(OBJDIR)/*.o
++	ln -sf $(LIBSH) $(LIBSO)
+ 
+ clean :
+ 	cd BinaryOperations  ; make clean -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
diff --git a/graphics/wildmagic/files/patch-LibPhysics_makefile.wm4 b/graphics/wildmagic/files/patch-LibPhysics_makefile.wm4
new file mode 100644
index 000000000000..5c583dba5ad8
--- /dev/null
+++ b/graphics/wildmagic/files/patch-LibPhysics_makefile.wm4
@@ -0,0 +1,20 @@
+--- LibPhysics/makefile.wm4.orig	Thu May 31 18:08:03 2007
++++ LibPhysics/makefile.wm4	Thu May 31 18:19:51 2007
+@@ -1,3 +1,8 @@
++OBJDIR := $(CFG)
++LIBSH := ../SDK/Library/$(CFG)/libWm4Physics.so.0
++LIBSO := ../SDK/Library/$(CFG)/libWm4Physics.so
++SHLIBLDFLAGS = -shared
++
+ build :
+ 	@mkdir -p ../SDK/Include
+ 	@mkdir -p ../SDK/Library/$(CFG)
+@@ -7,6 +12,8 @@
+ 	cd LCPSolver         ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
+ 	cd ParticleSystem    ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
+ 	cd RigidBody         ; make -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
++	$(CC) $(SHLIBLDFLAGS) -o $(LIBSH) $(OBJDIR)/*.o
++	ln -sf $(LIBSH) $(LIBSO)
+ 
+ clean :
+ 	cd Intersection      ; make clean -f ../makeprj.wm4 CFG=$(CFG) SYS=$(SYS)
diff --git a/graphics/wildmagic/files/patch-LibRenderers_OpenGLRenderer_makefile.wm4 b/graphics/wildmagic/files/patch-LibRenderers_OpenGLRenderer_makefile.wm4
new file mode 100644
index 000000000000..5b278cb8d6c3
--- /dev/null
+++ b/graphics/wildmagic/files/patch-LibRenderers_OpenGLRenderer_makefile.wm4
@@ -0,0 +1,26 @@
+--- LibRenderers/OpenGLRenderer/makefile.wm4.orig	Thu May 31 21:57:37 2007
++++ LibRenderers/OpenGLRenderer/makefile.wm4	Thu May 31 22:03:02 2007
+@@ -42,7 +42,7 @@
+ ifeq (Debug,$(findstring Debug,$(CFG)))
+ CFLAGS += -g -D_DEBUG
+ else
+-CFLAGS += -O2 -DNDEBUG
++CFLAGS += -DNDEBUG
+ endif
+ 
+ ifeq (Memory,$(findstring Memory,$(CFG)))
+@@ -57,9 +57,14 @@
+ SRC := $(notdir $(SRC))
+ OBJ := $(SRC:%.cpp=$(CFG)/%.o) $(SRC:%.c=$(CFG)/%.o)
+ LIB := ../../SDK/Library/$(CFG)/libWm4OpenGLRenderer.a
++LIBSH := ../../SDK/Library/$(CFG)/libWm4OpenGLRenderer.so.0
++LIBSO := ../../SDK/Library/$(CFG)/libWm4OpenGLRenderer.so
++SHLIBLDFLAGS = -shared
+ 
+ build : $(OBJ)
+ 	$(AR) $(ARFLAGS) $(LIB) $(CFG)/*.o
++	$(CC) $(SHLIBLDFLAGS) -o $(LIBSH) $(CFG)/*.o
++	ln -sf $(LIBSH) $(LIBSO)
+ 	cp -fp $(INC) $(INCDIR)
+ 
+ $(CFG)/%.o : %.cpp
diff --git a/graphics/wildmagic/files/patch-LibRenderers_SoftRenderer_makefile.wm4 b/graphics/wildmagic/files/patch-LibRenderers_SoftRenderer_makefile.wm4
new file mode 100644
index 000000000000..781b2dcbef3f
--- /dev/null
+++ b/graphics/wildmagic/files/patch-LibRenderers_SoftRenderer_makefile.wm4
@@ -0,0 +1,26 @@
+--- LibRenderers/SoftRenderer/makefile.wm4.orig	Thu May 31 21:57:37 2007
++++ LibRenderers/SoftRenderer/makefile.wm4	Thu May 31 22:08:12 2007
+@@ -38,7 +38,7 @@
+ ifeq (Debug,$(findstring Debug,$(CFG)))
+ CFLAGS += -g -D_DEBUG
+ else
+-CFLAGS += -O2 -DNDEBUG
++CFLAGS += -DNDEBUG
+ endif
+ 
+ ifeq (Memory,$(findstring Memory,$(CFG)))
+@@ -51,9 +51,14 @@
+ SRC := $(notdir $(SRC))
+ OBJ := $(SRC:%.cpp=$(CFG)/%.o) $(SRC:%.c=$(CFG)/%.o)
+ LIB := ../../SDK/Library/$(CFG)/libWm4SoftRenderer.a
++LIBSH := ../../SDK/Library/$(CFG)/libWm4SoftRenderer.so.0
++LIBSO := ../../SDK/Library/$(CFG)/libWm4SoftRenderer.so
++SHLIBLDFLAGS = -shared
+ 
+ build : $(OBJ)
+ 	$(AR) $(ARFLAGS) $(LIB) $(CFG)/*.o
++	$(CC) $(SHLIBLDFLAGS) -o $(LIBSH) $(CFG)/*.o
++	ln -sf $(LIBSH) $(LIBSO)
+ 	cp -fp $(INC) $(INCDIR)
+ 
+ $(CFG)/%.o : %.cpp
diff --git a/graphics/wildmagic/pkg-plist b/graphics/wildmagic/pkg-plist
index f54745a65183..5440cbae3331 100644
--- a/graphics/wildmagic/pkg-plist
+++ b/graphics/wildmagic/pkg-plist
@@ -742,12 +742,24 @@ include/%%WM%%/%%WM%%WindowApplication3.h
 include/%%WM%%/%%WM%%WireframeState.h
 %%SOFT%%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
 lib/lib%%WM%%Graphics.a
+lib/lib%%WM%%Graphics.so
+lib/lib%%WM%%Graphics.so.0
 lib/lib%%WM%%Imagics.a
+lib/lib%%WM%%Imagics.so
+lib/lib%%WM%%Imagics.so.0
 lib/lib%%WM%%Physics.a
-lib/lib%%WM%%%%GRF%%Application.a
-lib/lib%%WM%%%%GRF%%Renderer.a
+lib/lib%%WM%%Physics.so
+lib/lib%%WM%%Physics.so.0
 %%DATADIR%%/Data/Im/Binary.im
 %%DATADIR%%/Data/Im/Head.im
 %%DATADIR%%/Data/Im/Molecule.im