aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/Makefile1
-rw-r--r--devel/ode-devel/Makefile40
-rw-r--r--devel/ode-devel/distinfo5
-rw-r--r--devel/ode-devel/files/patch-Makefile8
-rw-r--r--devel/ode/Makefile2
5 files changed, 25 insertions, 31 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 5e83ee073dac..9bb5ae78ff09 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -634,6 +634,7 @@
SUBDIR += ocaml-ulex
SUBDIR += ocamlweb
SUBDIR += ode
+ SUBDIR += ode-devel
SUBDIR += omniNotify
SUBDIR += omniORB
SUBDIR += oniguruma
diff --git a/devel/ode-devel/Makefile b/devel/ode-devel/Makefile
index 68d54a7e3e62..f9bb730a84d7 100644
--- a/devel/ode-devel/Makefile
+++ b/devel/ode-devel/Makefile
@@ -6,16 +6,18 @@
#
PORTNAME= ode
-PORTVERSION= 0.5
-PORTREVISION= 1
-PORTEPOCH= 1
+DISTVERSION= ${ODEVER}-051009
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= opende
-EXTRACT_SUFX= .tgz
+MASTER_SITES= http://opende.sourceforge.net/snapshots/
+PKGNAMESUFFIX= -devel
+DISTNAME= ${PORTNAME}-${DISTVERSION:S/${ODEVER}-//}
-MAINTAINER= dyeske@yahoo.com
-COMMENT= Articulated rigid body dynamics library
+MAINTAINER= acardenas@bsd.org.pe
+COMMENT= Articulated rigid body dynamics library (devel)
+
+ODEVER= 0.5
+
+CONFLICTS= ode-[0-9].*
USE_X_PREFIX= yes
USE_GL= yes
@@ -26,28 +28,16 @@ OPTIONS= OPCODE "Enable code required by TriList (trimesh) class" on
.include <bsd.port.pre.mk>
-.if ${ARCH} == "amd64"
-BROKEN= "Does not build on amd64"
-.endif
-
post-patch:
- @${REINPLACE_CMD} -e \
- 's|malloc.h|stdlib.h|g' \
+ @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
${WRKSRC}/configurator.c
- @${REINPLACE_CMD} -e \
- 's|g++|${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|${CXXFLAGS} -I${X11BASE}/include|' \
+ @${REINPLACE_CMD} -e 's|g++|${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|${CXXFLAGS} -I${X11BASE}/include|' \
${WRKSRC}/config/makefile.unix-gcc
.if !defined(WITHOUT_OPCODE)
- @${REINPLACE_CMD} -e \
- 's/^#OPCODE_DIRECTORY/OPCODE_DIRECTORY/' \
+ @${REINPLACE_CMD} -e 's/^#OPCODE_DIRECTORY/OPCODE_DIRECTORY/' \
${WRKSRC}/config/user-settings
.endif
diff --git a/devel/ode-devel/distinfo b/devel/ode-devel/distinfo
index 760b3f4769dd..f8b4dd1b0170 100644
--- a/devel/ode-devel/distinfo
+++ b/devel/ode-devel/distinfo
@@ -1,2 +1,3 @@
-MD5 (ode-0.5.tgz) = b33b21e04ee9661f27802b6b6c8eefd2
-SIZE (ode-0.5.tgz) = 1710720
+MD5 (ode-051009.tar.gz) = 211c991de59b6f0d1a48e6361ee4e243
+SHA256 (ode-051009.tar.gz) = bbc56831e64071432e9f623c916d0f8b0f4403f7da9ba422811311d0ba38fc4e
+SIZE (ode-051009.tar.gz) = 1742585
diff --git a/devel/ode-devel/files/patch-Makefile b/devel/ode-devel/files/patch-Makefile
index 0507e3210d1b..5beab85ea870 100644
--- a/devel/ode-devel/files/patch-Makefile
+++ b/devel/ode-devel/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Jun 9 16:12:12 2004
-+++ Makefile Wed Jun 9 16:13:39 2004
-@@ -329,13 +329,13 @@
+--- Makefile Sun Nov 6 22:34:29 2005
++++ Makefile Sun Nov 6 22:37:04 2005
+@@ -332,13 +332,13 @@
-$(DEL_CMD) OPCODE/*.obj OPCODE/*.o OPCODE/Ice/*.obj OPCODE/Ice/*.o
%$(OBJ): %.c
@@ -17,7 +17,7 @@
# windows specific rules
-@@ -357,7 +357,7 @@
+@@ -360,7 +360,7 @@
# unix-gcc specific dependency making
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index 68d54a7e3e62..2ad28f3cb2e6 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -17,6 +17,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dyeske@yahoo.com
COMMENT= Articulated rigid body dynamics library
+CONFLICTS= ode-devel-[0-9].*
+
USE_X_PREFIX= yes
USE_GL= yes
USE_GMAKE= yes