Wed Nov 25 23:41:42 2009 UTC ()
Prepare for libtool-2.2: needs explicit --tag as it is using g++.


(joerg)
diff -r1.6 -r1.7 pkgsrc/devel/ode/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/ode/patches/patch-aa
cvs diff -r1.6 -r1.7 pkgsrc/devel/ode/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ode/distinfo 2008/10/02 17:53:36 1.6
+++ pkgsrc/devel/ode/distinfo 2009/11/25 23:41:42 1.7
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.6 2008/10/02 17:53:36 joerg Exp $ 1$NetBSD: distinfo,v 1.7 2009/11/25 23:41:42 joerg Exp $
2 2
3SHA1 (ode-0.5.tgz) = f13756f1192d24101b6d1a3c14feb43efbf0b281 3SHA1 (ode-0.5.tgz) = f13756f1192d24101b6d1a3c14feb43efbf0b281
4RMD160 (ode-0.5.tgz) = 3410a842731c1bb24f306f4d23509533664321aa 4RMD160 (ode-0.5.tgz) = 3410a842731c1bb24f306f4d23509533664321aa
5Size (ode-0.5.tgz) = 1710720 bytes 5Size (ode-0.5.tgz) = 1710720 bytes
6SHA1 (patch-aa) = 216a15a8ebfd7195215e1396ac94c4508fafbf30 6SHA1 (patch-aa) = 1e3efc6076b03bbdb0d9f14487d2a951267c974c
7SHA1 (patch-ab) = 87b7914946fca9362ab7334525b6c982b9981cad 7SHA1 (patch-ab) = 87b7914946fca9362ab7334525b6c982b9981cad
8SHA1 (patch-ac) = 858cfe364bbfe5b637d63b564a54e4615fcf2f85 8SHA1 (patch-ac) = 858cfe364bbfe5b637d63b564a54e4615fcf2f85
cvs diff -r1.1 -r1.2 pkgsrc/devel/ode/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/ode/patches/Attic/patch-aa 2006/02/10 20:35:28 1.1
+++ pkgsrc/devel/ode/patches/Attic/patch-aa 2009/11/25 23:41:42 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-aa,v 1.1 2006/02/10 20:35:28 adam Exp $ 1$NetBSD: patch-aa,v 1.2 2009/11/25 23:41:42 joerg Exp $
2 2
3--- Makefile.orig 2004-05-18 20:07:45.000000000 +0200 3--- Makefile.orig 2004-05-18 20:07:45.000000000 +0200
4+++ Makefile 4+++ Makefile
5@@ -291,7 +291,8 @@ ifeq ($(WINDOWS16),1) 5@@ -291,7 +291,8 @@ ifeq ($(WINDOWS16),1)
6 else 6 else
7 # if we have no command-line-length limitation, directly specify all 7 # if we have no command-line-length limitation, directly specify all
8 # object files to be linked. 8 # object files to be linked.
9- $(ODE_LIB_AR_RULE) $(ODE_OBJECTS) 9- $(ODE_LIB_AR_RULE) $(ODE_OBJECTS)
10+ ${LIBTOOL} --mode=link ${CC} -o ${ODE_LIB:.a=.la} \ 10+ ${LIBTOOL} --mode=link --tag=CXX ${CC} -o ${ODE_LIB:.a=.la} \
11+ ${ODE_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:5 11+ ${ODE_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:5
12 endif 12 endif
13  13
14 ifdef RANLIB 14 ifdef RANLIB
15@@ -329,10 +330,10 @@ clean: 15@@ -329,10 +330,10 @@ clean:
16 -$(DEL_CMD) OPCODE/*.obj OPCODE/*.o OPCODE/Ice/*.obj OPCODE/Ice/*.o 16 -$(DEL_CMD) OPCODE/*.obj OPCODE/*.o OPCODE/Ice/*.obj OPCODE/Ice/*.o
17  17
18 %$(OBJ): %.c 18 %$(OBJ): %.c
19- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $< 19- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
20+ ${LIBTOOL} --mode=compile $(CC) $(C_FLAGS) $(CFLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $< 20+ ${LIBTOOL} --mode=compile --tag=CC $(CC) $(C_FLAGS) $(CFLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
21  21
22 %$(OBJ): %.cpp 22 %$(OBJ): %.cpp
23- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $< 23- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
24+ ${LIBTOOL} --mode=compile $(CC) $(C_FLAGS) $(CFLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $< 24+ ${LIBTOOL} --mode=compile --tag=CXX $(CC) $(C_FLAGS) $(CFLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
25  25
26 %.exe: %$(OBJ) 26 %.exe: %$(OBJ)
27 $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) 27 $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)