Attachment #43660 for bug #67741

View | Details | Raw Unified | Return to bug 67741
Collapse All | Expand All




#

PORTNAME=	ode
PORTVERSION=	0.5
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	opende

		${WRKSRC}/configurator.c

	@${REINPLACE_CMD} -e \
		's|^CC.+$$|CC=${CXX}|; \
		s|-fno-rtti||' \
		${WRKSRC}/OPCODE/Makefile

	@${REINPLACE_CMD} -E -e \
		's|^CC.+$$|CC=${CC}|; \
		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|${CXXFLAGS} -I${X11BASE}/include|' \
		${WRKSRC}/config/makefile.unix-gcc

do-install:

Line 1 Link Here

(-)distinfo (-1 / +2 lines)
1	MD5 (ode-0.039.tgz) = 5a6675043791dc432eb56c58d87f6180	1	MD5 (ode-0.5.tgz) = b33b21e04ee9661f27802b6b6c8eefd2
		2	SIZE (ode-0.5.tgz) = 1710720

Lines 4-10 Link Here

(-)pkg-descr (-1 / +1 lines)
4	and platform independent, with advanced joints, contact with friction,	4	and platform independent, with advanced joints, contact with friction,
5	and built-in collision detection.	5	and built-in collision detection.
6		6
7	WWW: http://opende.sourceforge.net/	7	WWW: http://www.ode.org/
8		8
9	- David	9	- David
10	dyeske@yahoo.com	10	dyeske@yahoo.com




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/export-dif.h     
include/ode/mass.h
include/ode/matrix.h
include/ode/memory.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




--- 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)$@ $<

+	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $<
 
 %.exe: %$(OBJ)
-	$(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
@@ -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) | tools/process_deps ode/src/ > Makefile.deps
 	$(DEP_RULE) $(DRAWSTUFF_SRC) | tools/process_deps drawstuff/src/ >> Makefile.deps

Return to bug 67741

Lines 6-12 Link Here

(-)Makefile (-8 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= ode	8	PORTNAME= ode
9	PORTVERSION= 0.039	9	PORTVERSION= 0.5
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= opende	12	MASTER_SITE_SUBDIR= opende
Lines 32-50 Link Here
32	${WRKSRC}/configurator.c	32	${WRKSRC}/configurator.c
33		33
34	@${REINPLACE_CMD} -e \	34	@${REINPLACE_CMD} -e \
35	's\|gcc\|${CC}\|; \	35	's\|^CC.+$$\|CC=${CXX}\|; \
36	s\|-fno-rtti\|\|' \
37	${WRKSRC}/OPCODE/Makefile
38
39	@${REINPLACE_CMD} -E -e \
40	's\|^CC.+$$\|CC=${CC}\|; \
41	s\|-Wall\|\|g; \	36	s\|-Wall\|\|g; \
42	s\|-L/usr/X11/lib\|-lXext\|; \	37	s\|-L/usr/X11/lib\|-lXext\|; \
43	s\|-L/usr/lib/X11R6\|\|; \	38	s\|-L/usr/lib/X11R6\|\|; \
44	s\|-L/usr/lib/X11\|\|; \	39	s\|-L/usr/lib/X11\|\|; \
45	s\|-L/usr/X11R6/lib\|-L${X11BASE}/lib\|; \	40	s\|-L/usr/X11R6/lib\|-L${X11BASE}/lib\|; \
46	s\|-fno-rtti\|\|; \	41	s\|-fno-rtti\|\|; \
47	s\|-ffast-math\|${CFLAGS} -I${X11BASE}/include\|' \	42	s\|-ffast-math\|${CXXFLAGS} -I${X11BASE}/include\|' \
48	${WRKSRC}/config/makefile.unix-gcc	43	${WRKSRC}/config/makefile.unix-gcc
49		44
50	do-install:	45	do-install:

Lines 4-13 Link Here

(-)pkg-plist (-3 / +2 lines)
4	include/ode/collision_space.h	4	include/ode/collision_space.h
5	include/ode/collision_trimesh.h	5	include/ode/collision_trimesh.h
6	include/ode/common.h	6	include/ode/common.h
		7	include/ode/compatibility.h
7	include/ode/config.h	8	include/ode/config.h
8	include/ode/contact.h	9	include/ode/contact.h
9	include/ode/error.h	10	include/ode/error.h
10	include/ode/geom.h	11	include/ode/export-dif.h
11	include/ode/mass.h	12	include/ode/mass.h
12	include/ode/matrix.h	13	include/ode/matrix.h
13	include/ode/memory.h	14	include/ode/memory.h
Lines 17-25 Link Here
17	include/ode/odecpp.h	18	include/ode/odecpp.h
18	include/ode/odecpp_collision.h	19	include/ode/odecpp_collision.h
19	include/ode/odecpp_old.h	20	include/ode/odecpp_old.h
20	include/ode/odecpp_old_collision.h
21	include/ode/odemath.h	21	include/ode/odemath.h
22	include/ode/rotation.h	22	include/ode/rotation.h
23	include/ode/space.h
24	include/ode/timer.h	23	include/ode/timer.h
25	@dirrm include/ode	24	@dirrm include/ode

Lines 1-7 Link Here

(-)files/patch-Makefile (-8 / +8 lines)
1	--- Makefile.orig Fri Jul 11 02:37:58 2003	1	--- Makefile.orig Wed Jun 9 16:12:12 2004
2	+++ Makefile Thu Oct 16 21:14:17 2003	2	+++ Makefile Wed Jun 9 16:13:39 2004
3	@@ -280,13 +280,13 @@	3	@@ -329,13 +329,13 @@
4	-$(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)	4	-$(DEL_CMD) OPCODE/.obj OPCODE/.o OPCODE/Ice/.obj OPCODE/Ice/.o
5		5
6	%$(OBJ): %.c	6	%$(OBJ): %.c
7	- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<	7	- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
Lines 12-28 Link Here
12	+ $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $<	12	+ $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $<
13		13
14	%.exe: %$(OBJ)	14	%.exe: %$(OBJ)
15	- $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(OPCODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)	15	- $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
16	+ $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(OPCODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS}	16	+ $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS}
17		17
18		18
19	# windows specific rules	19	# windows specific rules
20	@@ -308,7 +308,7 @@	20	@@ -357,7 +357,7 @@
21		21
22	# unix-gcc specific dependency making	22	# unix-gcc specific dependency making
23		23
24	-DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES)	24	-DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES)
25	+DEP_RULE=${CC} -M $(C_INC)$(INCPATH) $(DEFINES)	25	+DEP_RULE=${CC} -M $(C_INC)$(INCPATH) $(DEFINES)
26	depend:	26	depend:
27	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) $(ODE_OLD_COLLISION_SRC) $(ODE_NEW_COLLISION_SRC) \| tools/process_deps ode/src/ > Makefile.deps	27	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) \| tools/process_deps ode/src/ > Makefile.deps
28	$(DEP_RULE) $(DRAWSTUFF_SRC) \| tools/process_deps drawstuff/src/ >> Makefile.deps	28	$(DEP_RULE) $(DRAWSTUFF_SRC) \| tools/process_deps drawstuff/src/ >> Makefile.deps