From ijliao@FreeBSD.csie.NCTU.edu.tw  Wed Jun  9 08:22:36 2004
Return-Path: <ijliao@FreeBSD.csie.NCTU.edu.tw>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9B8D916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Jun 2004 08:22:36 +0000 (GMT)
Received: from FreeBSD.csie.NCTU.edu.tw (freebsd.csie.nctu.edu.tw [140.113.17.209])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1129743D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Jun 2004 08:22:36 +0000 (GMT)
	(envelope-from ijliao@FreeBSD.csie.NCTU.edu.tw)
Received: from localhost (unknown [127.0.0.1])
	by FreeBSD.csie.NCTU.edu.tw (Postfix) with ESMTP id 8E180106BF2
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Jun 2004 16:22:03 +0800 (CST)
Received: from FreeBSD.csie.NCTU.edu.tw ([127.0.0.1])
 by localhost (FreeBSD.csie.NCTU.edu.tw [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 10777-07 for <FreeBSD-gnats-submit@freebsd.org>;
 Wed,  9 Jun 2004 16:22:02 +0800 (CST)
Received: by FreeBSD.csie.NCTU.edu.tw (Postfix, from userid 1041)
	id 6040A106BD8; Wed,  9 Jun 2004 16:22:02 +0800 (CST)
Message-Id: <20040609082202.6040A106BD8@FreeBSD.csie.NCTU.edu.tw>
Date: Wed,  9 Jun 2004 16:22:02 +0800 (CST)
From: Ying-Chieh Liao <ijliao@FreeBSD.csie.NCTU.edu.tw>
Reply-To: Ying-Chieh Liao <ijliao@FreeBSD.csie.NCTU.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: upgrade ports/devel/ode to 0.5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         67741
>Category:       ports
>Synopsis:       upgrade ports/devel/ode to 0.5
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 09 08:30:24 GMT 2004
>Closed-Date:    Sat Jun 26 18:36:33 GMT 2004
>Last-Modified:  Sat Jun 26 18:36:33 GMT 2004
>Originator:     Ying-Chieh Liao
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
NCTU CSIE
>Environment:
System: FreeBSD FreeBSD.csie.NCTU.edu.tw 4.10-STABLE FreeBSD 4.10-STABLE #0: Sat May 29 08:18:00 CST 2004 root@FreeBSD.csie.NCTU.edu.tw:/home/usr.obj/big/freebsd/pub/branches/4.0-stable/src/sys/FREEBSD i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

	

--- patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/ode/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	3 Apr 2004 13:52:48 -0000	1.2
+++ Makefile	9 Jun 2004 08:20:57 -0000
@@ -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 @@
 		${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:
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/ode/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	15 Mar 2004 09:57:40 -0000	1.1
+++ distinfo	9 Jun 2004 08:20:57 -0000
@@ -1 +1,2 @@
-MD5 (ode-0.039.tgz) = 5a6675043791dc432eb56c58d87f6180
+MD5 (ode-0.5.tgz) = b33b21e04ee9661f27802b6b6c8eefd2
+SIZE (ode-0.5.tgz) = 1710720
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/devel/ode/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr	15 Mar 2004 09:57:40 -0000	1.1
+++ pkg-descr	9 Jun 2004 08:20:57 -0000
@@ -4,7 +4,7 @@
 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
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/ode/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	15 Mar 2004 09:57:40 -0000	1.1
+++ pkg-plist	9 Jun 2004 08:20:57 -0000
@@ -4,10 +4,11 @@
 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/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
Index: files/patch-Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/ode/files/patch-Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile
--- files/patch-Makefile	15 Mar 2004 09:57:40 -0000	1.1
+++ files/patch-Makefile	9 Jun 2004 08:20:57 -0000
@@ -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
--- patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Fri Jun 11 14:05:20 GMT 2004 
State-Changed-Why:  
Asked maintainer for approval. 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Fri Jun 11 14:05:20 GMT 2004 
Responsible-Changed-Why:  
Handle. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67741 

From: Pav Lucistnik <pav@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org,
	ijliao@FreeBSD.csie.NCTU.edu.tw, dyeske@yahoo.com
Cc:  
Subject: Re: ports/67741: upgrade ports/devel/ode to 0.5
Date: Fri, 11 Jun 2004 16:05:17 +0200

 Dear maintainer of FreeBSD port devel/ode, please take a look at
 
 http://www.freebsd.org/cgi/query-pr.cgi?q=67741
 
 Do you approve this update?
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 Oh, no! Aaargh! It is the most unnatural, most disgusting
 creature imaginable: a two-eyed cyclops!
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Sat Jun 26 18:36:26 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67741 
>Unformatted:
