10 files changed, 32 insertions, 42 deletions

diff --git a/devel/ode-devel/Makefile b/devel/ode-devel/Makefile
index 2a68234a3232..edf20b09e563 100644
--- a/devel/ode-devel/Makefile
+++ b/devel/ode-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ode
-PORTVERSION=	0.039
+PORTVERSION=	0.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	opende
@@ -32,19 +32,14 @@ post-patch:
 		${WRKSRC}/configurator.c
 
 	@${REINPLACE_CMD} -e \
-		's|gcc|${CC}|; \
-		s|-fno-rtti||' \
-		${WRKSRC}/OPCODE/Makefile
-
-	@${REINPLACE_CMD} -E -e \
-		's|^CC.+$$|CC=${CC}|; \
+		's|^CC.+$$|CC=${CXX}|; \
 		s|-Wall||g; \
 		s|-L/usr/X11/lib|-lXext|; \
 		s|-L/usr/lib/X11R6||; \
 		s|-L/usr/lib/X11||; \
 		s|-L/usr/X11R6/lib|-L${X11BASE}/lib|; \
 		s|-fno-rtti||; \
-		s|-ffast-math|${CFLAGS} -I${X11BASE}/include|' \
+		s|-ffast-math|${CXXFLAGS} -I${X11BASE}/include|' \
 		${WRKSRC}/config/makefile.unix-gcc
 
 do-install:
diff --git a/devel/ode-devel/distinfo b/devel/ode-devel/distinfo
index 42e90aa9079d..760b3f4769dd 100644
--- a/devel/ode-devel/distinfo
+++ b/devel/ode-devel/distinfo
@@ -1 +1,2 @@
-MD5 (ode-0.039.tgz) = 5a6675043791dc432eb56c58d87f6180
+MD5 (ode-0.5.tgz) = b33b21e04ee9661f27802b6b6c8eefd2
+SIZE (ode-0.5.tgz) = 1710720
diff --git a/devel/ode-devel/files/patch-Makefile b/devel/ode-devel/files/patch-Makefile
index c20ead90b1c8..f5b40782f98d 100644
--- a/devel/ode-devel/files/patch-Makefile
+++ b/devel/ode-devel/files/patch-Makefile
@@ -1,7 +1,7 @@
---- Makefile.orig	Fri Jul 11 02:37:58 2003
-+++ Makefile	Thu Oct 16 21:14:17 2003
-@@ -280,13 +280,13 @@
- 	-$(DEL_CMD) $(ODE_OBJECTS) $(ODE_TEST_EXE) $(ODE_LIB) $(DRAWSTUFF_OBJECTS) $(DRAWSTUFF_TEST_EXE) $(DRAWSTUFF_LIB) ode/test/*$(OBJ) drawstuff/dstest/*$(OBJ) $(CONFIGURATOR_EXE) $(CONFIG_H)
+--- Makefile.orig	Wed Jun  9 16:12:12 2004
++++ Makefile	Wed Jun  9 16:13:39 2004
+@@ -329,13 +329,13 @@
+ 	-$(DEL_CMD) OPCODE/*.obj OPCODE/*.o OPCODE/Ice/*.obj OPCODE/Ice/*.o
  
  %$(OBJ): %.c
 -	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
@@ -12,17 +12,17 @@
 +	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $<
  
  %.exe: %$(OBJ)
--	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(OPCODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
-+	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(OPCODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS}
+-	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
++	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS}
  
  
  # windows specific rules
-@@ -308,7 +308,7 @@
+@@ -357,7 +357,7 @@
  
  # unix-gcc specific dependency making
  
 -DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES)
 +DEP_RULE=${CC} -M $(C_INC)$(INCPATH) $(DEFINES)
  depend:
- 	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) $(ODE_OLD_COLLISION_SRC) $(ODE_NEW_COLLISION_SRC) | tools/process_deps ode/src/ > Makefile.deps
+ 	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) | tools/process_deps ode/src/ > Makefile.deps
  	$(DEP_RULE) $(DRAWSTUFF_SRC) | tools/process_deps drawstuff/src/ >> Makefile.deps
diff --git a/devel/ode-devel/ode/Makefile b/devel/ode-devel/ode/Makefile
index 2a68234a3232..edf20b09e563 100644
--- a/devel/ode-devel/ode/Makefile
+++ b/devel/ode-devel/ode/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ode
-PORTVERSION=	0.039
+PORTVERSION=	0.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	opende
@@ -32,19 +32,14 @@ post-patch:
 		${WRKSRC}/configurator.c
 
 	@${REINPLACE_CMD} -e \
-		's|gcc|${CC}|; \
-		s|-fno-rtti||' \
-		${WRKSRC}/OPCODE/Makefile
-
-	@${REINPLACE_CMD} -E -e \
-		's|^CC.+$$|CC=${CC}|; \
+		's|^CC.+$$|CC=${CXX}|; \
 		s|-Wall||g; \
 		s|-L/usr/X11/lib|-lXext|; \
 		s|-L/usr/lib/X11R6||; \
 		s|-L/usr/lib/X11||; \
 		s|-L/usr/X11R6/lib|-L${X11BASE}/lib|; \
 		s|-fno-rtti||; \
-		s|-ffast-math|${CFLAGS} -I${X11BASE}/include|' \
+		s|-ffast-math|${CXXFLAGS} -I${X11BASE}/include|' \
 		${WRKSRC}/config/makefile.unix-gcc
 
 do-install:
diff --git a/devel/ode-devel/ode/distinfo b/devel/ode-devel/ode/distinfo
index 42e90aa9079d..760b3f4769dd 100644
--- a/devel/ode-devel/ode/distinfo
+++ b/devel/ode-devel/ode/distinfo
@@ -1 +1,2 @@
-MD5 (ode-0.039.tgz) = 5a6675043791dc432eb56c58d87f6180
+MD5 (ode-0.5.tgz) = b33b21e04ee9661f27802b6b6c8eefd2
+SIZE (ode-0.5.tgz) = 1710720
diff --git a/devel/ode-devel/ode/files/patch-Makefile b/devel/ode-devel/ode/files/patch-Makefile
index c20ead90b1c8..f5b40782f98d 100644
--- a/devel/ode-devel/ode/files/patch-Makefile
+++ b/devel/ode-devel/ode/files/patch-Makefile
@@ -1,7 +1,7 @@
---- Makefile.orig	Fri Jul 11 02:37:58 2003
-+++ Makefile	Thu Oct 16 21:14:17 2003
-@@ -280,13 +280,13 @@
- 	-$(DEL_CMD) $(ODE_OBJECTS) $(ODE_TEST_EXE) $(ODE_LIB) $(DRAWSTUFF_OBJECTS) $(DRAWSTUFF_TEST_EXE) $(DRAWSTUFF_LIB) ode/test/*$(OBJ) drawstuff/dstest/*$(OBJ) $(CONFIGURATOR_EXE) $(CONFIG_H)
+--- Makefile.orig	Wed Jun  9 16:12:12 2004
++++ Makefile	Wed Jun  9 16:13:39 2004
+@@ -329,13 +329,13 @@
+ 	-$(DEL_CMD) OPCODE/*.obj OPCODE/*.o OPCODE/Ice/*.obj OPCODE/Ice/*.o
  
  %$(OBJ): %.c
 -	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
@@ -12,17 +12,17 @@
 +	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $<
  
  %.exe: %$(OBJ)
--	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(OPCODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
-+	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(OPCODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS}
+-	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
++	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS}
  
  
  # windows specific rules
-@@ -308,7 +308,7 @@
+@@ -357,7 +357,7 @@
  
  # unix-gcc specific dependency making
  
 -DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES)
 +DEP_RULE=${CC} -M $(C_INC)$(INCPATH) $(DEFINES)
  depend:
- 	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) $(ODE_OLD_COLLISION_SRC) $(ODE_NEW_COLLISION_SRC) | tools/process_deps ode/src/ > Makefile.deps
+ 	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) | tools/process_deps ode/src/ > Makefile.deps
  	$(DEP_RULE) $(DRAWSTUFF_SRC) | tools/process_deps drawstuff/src/ >> Makefile.deps
diff --git a/devel/ode-devel/ode/pkg-descr b/devel/ode-devel/ode/pkg-descr
index d6985ee7a0c2..d830901b9b39 100644
--- a/devel/ode-devel/ode/pkg-descr
+++ b/devel/ode-devel/ode/pkg-descr
@@ -4,7 +4,7 @@ and moving objects in VR environments. It is fast, flexible, robust
 and platform independent, with advanced joints, contact with friction,
 and built-in collision detection.
 
-WWW: http://opende.sourceforge.net/
+WWW: http://www.ode.org/
 
 - David
 dyeske@yahoo.com
diff --git a/devel/ode-devel/ode/pkg-plist b/devel/ode-devel/ode/pkg-plist
index fc8ccd1a25d2..3c554939e2db 100644
--- a/devel/ode-devel/ode/pkg-plist
+++ b/devel/ode-devel/ode/pkg-plist
@@ -4,10 +4,11 @@ include/ode/collision.h
 include/ode/collision_space.h
 include/ode/collision_trimesh.h
 include/ode/common.h
+include/ode/compatibility.h
 include/ode/config.h
 include/ode/contact.h
 include/ode/error.h
-include/ode/geom.h
+include/ode/export-dif.h     
 include/ode/mass.h
 include/ode/matrix.h
 include/ode/memory.h
@@ -17,9 +18,7 @@ include/ode/ode.h
 include/ode/odecpp.h
 include/ode/odecpp_collision.h
 include/ode/odecpp_old.h
-include/ode/odecpp_old_collision.h
 include/ode/odemath.h
 include/ode/rotation.h
-include/ode/space.h
 include/ode/timer.h
 @dirrm include/ode
diff --git a/devel/ode-devel/pkg-descr b/devel/ode-devel/pkg-descr
index d6985ee7a0c2..d830901b9b39 100644
--- a/devel/ode-devel/pkg-descr
+++ b/devel/ode-devel/pkg-descr
@@ -4,7 +4,7 @@ and moving objects in VR environments. It is fast, flexible, robust
 and platform independent, with advanced joints, contact with friction,
 and built-in collision detection.
 
-WWW: http://opende.sourceforge.net/
+WWW: http://www.ode.org/
 
 - David
 dyeske@yahoo.com
diff --git a/devel/ode-devel/pkg-plist b/devel/ode-devel/pkg-plist
index fc8ccd1a25d2..3c554939e2db 100644
--- a/devel/ode-devel/pkg-plist
+++ b/devel/ode-devel/pkg-plist
@@ -4,10 +4,11 @@ include/ode/collision.h
 include/ode/collision_space.h
 include/ode/collision_trimesh.h
 include/ode/common.h
+include/ode/compatibility.h
 include/ode/config.h
 include/ode/contact.h
 include/ode/error.h
-include/ode/geom.h
+include/ode/export-dif.h     
 include/ode/mass.h
 include/ode/matrix.h
 include/ode/memory.h
@@ -17,9 +18,7 @@ include/ode/ode.h
 include/ode/odecpp.h
 include/ode/odecpp_collision.h
 include/ode/odecpp_old.h
-include/ode/odecpp_old_collision.h
 include/ode/odemath.h
 include/ode/rotation.h
-include/ode/space.h
 include/ode/timer.h
 @dirrm include/ode