aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Lehmann <oliver@FreeBSD.org>2006-09-18 17:31:39 +0000
committerOliver Lehmann <oliver@FreeBSD.org>2006-09-18 17:31:39 +0000
commitfe8896ea52fa0ff5edf88b99b2e5ce86b85960e7 (patch)
treeccfa242c2c3e4793ffe074f10549bceab88fe02a
parent0851ff5721b7be4487d00ab4c6186782f661c8ff (diff)
downloadports-fe8896ea52fa0ff5edf88b99b2e5ce86b85960e7.tar.gz
ports-fe8896ea52fa0ff5edf88b99b2e5ce86b85960e7.zip
Notes
-rw-r--r--games/ember/Makefile11
-rw-r--r--games/fwp/Makefile2
-rw-r--r--graphics/ogre312/Makefile4
-rw-r--r--graphics/ogre312/distinfo6
-rw-r--r--graphics/ogre312/pkg-plist2
-rw-r--r--graphics/ogre3d/Makefile4
-rw-r--r--graphics/ogre3d/distinfo6
-rw-r--r--graphics/ogre3d/pkg-plist2
-rw-r--r--graphics/ogre3d12/Makefile4
-rw-r--r--graphics/ogre3d12/distinfo6
-rw-r--r--graphics/ogre3d12/pkg-plist2
11 files changed, 26 insertions, 23 deletions
diff --git a/games/ember/Makefile b/games/ember/Makefile
index 9dc2a1b43704..7a686b7c27ff 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= Ember is a WorldForge 3d client using the OGRE 3d library
LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
- OgreMain.11:${PORTSDIR}/graphics/ogre3d \
+ OgreMain.12:${PORTSDIR}/graphics/ogre3d \
eris-1.3:${PORTSDIR}/devel/eris \
varconf-1.0.6:${PORTSDIR}/devel/varconf \
mercator-0.2.4:${PORTSDIR}/devel/mercator \
@@ -31,13 +31,14 @@ USE_GCC= 3.4
USE_X_PREFIX= YES
USE_GNOME= gnomehack
USE_BZIP2= YES
+USE_DOS2UNIX= YES
CPPFLAGS= -DBR_NO_MACROS
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 600000
-IGNORE= Does not compile because of inlining error
-.endif
+#.if ${OSVERSION} < 600000
+#IGNORE= Does not compile because of inlining error
+#.endif
post-patch:
@${REINPLACE_CMD} -e '\
@@ -68,6 +69,8 @@ post-patch:
${WRKSRC}/src/services/sound/SoundService.h
@${REINPLACE_CMD} -e 's|@LDFLAGS@|& -lopenal -lalut|' \
${WRKSRC}/src/components/ogre/Makefile.in
+ @${REINPLACE_CMD} '/^[ ]*\*[ ]/d' ${WRKSRC}/src/components/ogre/ogreopcode/opcode/*.cpp ${WRKSRC}/src/components/ogre/ogreopcode/opcode/*.h
+ @${REINPLACE_CMD} -e 's|^[ ]*//.*||g' ${WRKSRC}/src/components/ogre/ogreopcode/opcode/*.cpp ${WRKSRC}/src/components/ogre/ogreopcode/opcode/*.h
.if ${OSVERSION} < 500000
@${REINPLACE_CMD} -e 's|lrintf|(long int)rintf|g' \
${WRKSRC}/src/components/ogre/environment/meshtree/TStem.cpp \
diff --git a/games/fwp/Makefile b/games/fwp/Makefile
index 874b795eee31..f5aa0e0d1d83 100644
--- a/games/fwp/Makefile
+++ b/games/fwp/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= amdmi3@mail.ru
COMMENT= Multiplayer first person shooter
BUILD_DEPENDS= ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode
-LIB_DEPENDS= OgreMain.11:${PORTSDIR}/graphics/ogre3d
+LIB_DEPENDS= OgreMain.12:${PORTSDIR}/graphics/ogre3d
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/graphics/ogre312/Makefile b/graphics/ogre312/Makefile
index dae696891d06..ba96f5fe2da1 100644
--- a/graphics/ogre312/Makefile
+++ b/graphics/ogre312/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= ogre3d
-PORTVERSION= 1.2.2.p1
+PORTVERSION= 1.2.3
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=ogre
-DISTNAME= ogre-linux_osx-v${PORTVERSION:S/./-/g:S/-p/p/}
+DISTNAME= ogre-linux_osx-v${PORTVERSION:S/./-/g}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A scene-oriented, flexible 3D engine written in C++
diff --git a/graphics/ogre312/distinfo b/graphics/ogre312/distinfo
index c3928e94b7fb..e8d8dd7c1698 100644
--- a/graphics/ogre312/distinfo
+++ b/graphics/ogre312/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogre-linux_osx-v1-2-2p1.tar.bz2) = 34004bdde39427e9a3213286f8cc057a
-SHA256 (ogre-linux_osx-v1-2-2p1.tar.bz2) = 1c0c4f2a382301db1b7e89fc95e2a099a5a5891678923eabd0d72f26fc610547
-SIZE (ogre-linux_osx-v1-2-2p1.tar.bz2) = 22890671
+MD5 (ogre-linux_osx-v1-2-3.tar.bz2) = b2a8e3df61e2245c46457367a6b73ca0
+SHA256 (ogre-linux_osx-v1-2-3.tar.bz2) = 528c4050d3dc90ab34d7eb7c6dfb5cf1c8254a08b4f9195e063ced96f2a2a6a5
+SIZE (ogre-linux_osx-v1-2-3.tar.bz2) = 22956123
diff --git a/graphics/ogre312/pkg-plist b/graphics/ogre312/pkg-plist
index 3528dfffff8d..482f2f4adecc 100644
--- a/graphics/ogre312/pkg-plist
+++ b/graphics/ogre312/pkg-plist
@@ -232,7 +232,7 @@ lib/libCEGUIOgreRenderer.so.0
lib/libOgreMain.a
lib/libOgreMain.la
lib/libOgreMain.so
-lib/libOgreMain.so.11
+lib/libOgreMain.so.12
lib/libOgrePlatform.a
lib/libOgrePlatform.la
lib/libOgrePlatform.so
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index dae696891d06..ba96f5fe2da1 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= ogre3d
-PORTVERSION= 1.2.2.p1
+PORTVERSION= 1.2.3
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=ogre
-DISTNAME= ogre-linux_osx-v${PORTVERSION:S/./-/g:S/-p/p/}
+DISTNAME= ogre-linux_osx-v${PORTVERSION:S/./-/g}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A scene-oriented, flexible 3D engine written in C++
diff --git a/graphics/ogre3d/distinfo b/graphics/ogre3d/distinfo
index c3928e94b7fb..e8d8dd7c1698 100644
--- a/graphics/ogre3d/distinfo
+++ b/graphics/ogre3d/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogre-linux_osx-v1-2-2p1.tar.bz2) = 34004bdde39427e9a3213286f8cc057a
-SHA256 (ogre-linux_osx-v1-2-2p1.tar.bz2) = 1c0c4f2a382301db1b7e89fc95e2a099a5a5891678923eabd0d72f26fc610547
-SIZE (ogre-linux_osx-v1-2-2p1.tar.bz2) = 22890671
+MD5 (ogre-linux_osx-v1-2-3.tar.bz2) = b2a8e3df61e2245c46457367a6b73ca0
+SHA256 (ogre-linux_osx-v1-2-3.tar.bz2) = 528c4050d3dc90ab34d7eb7c6dfb5cf1c8254a08b4f9195e063ced96f2a2a6a5
+SIZE (ogre-linux_osx-v1-2-3.tar.bz2) = 22956123
diff --git a/graphics/ogre3d/pkg-plist b/graphics/ogre3d/pkg-plist
index 3528dfffff8d..482f2f4adecc 100644
--- a/graphics/ogre3d/pkg-plist
+++ b/graphics/ogre3d/pkg-plist
@@ -232,7 +232,7 @@ lib/libCEGUIOgreRenderer.so.0
lib/libOgreMain.a
lib/libOgreMain.la
lib/libOgreMain.so
-lib/libOgreMain.so.11
+lib/libOgreMain.so.12
lib/libOgrePlatform.a
lib/libOgrePlatform.la
lib/libOgrePlatform.so
diff --git a/graphics/ogre3d12/Makefile b/graphics/ogre3d12/Makefile
index dae696891d06..ba96f5fe2da1 100644
--- a/graphics/ogre3d12/Makefile
+++ b/graphics/ogre3d12/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= ogre3d
-PORTVERSION= 1.2.2.p1
+PORTVERSION= 1.2.3
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=ogre
-DISTNAME= ogre-linux_osx-v${PORTVERSION:S/./-/g:S/-p/p/}
+DISTNAME= ogre-linux_osx-v${PORTVERSION:S/./-/g}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A scene-oriented, flexible 3D engine written in C++
diff --git a/graphics/ogre3d12/distinfo b/graphics/ogre3d12/distinfo
index c3928e94b7fb..e8d8dd7c1698 100644
--- a/graphics/ogre3d12/distinfo
+++ b/graphics/ogre3d12/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogre-linux_osx-v1-2-2p1.tar.bz2) = 34004bdde39427e9a3213286f8cc057a
-SHA256 (ogre-linux_osx-v1-2-2p1.tar.bz2) = 1c0c4f2a382301db1b7e89fc95e2a099a5a5891678923eabd0d72f26fc610547
-SIZE (ogre-linux_osx-v1-2-2p1.tar.bz2) = 22890671
+MD5 (ogre-linux_osx-v1-2-3.tar.bz2) = b2a8e3df61e2245c46457367a6b73ca0
+SHA256 (ogre-linux_osx-v1-2-3.tar.bz2) = 528c4050d3dc90ab34d7eb7c6dfb5cf1c8254a08b4f9195e063ced96f2a2a6a5
+SIZE (ogre-linux_osx-v1-2-3.tar.bz2) = 22956123
diff --git a/graphics/ogre3d12/pkg-plist b/graphics/ogre3d12/pkg-plist
index 3528dfffff8d..482f2f4adecc 100644
--- a/graphics/ogre3d12/pkg-plist
+++ b/graphics/ogre3d12/pkg-plist
@@ -232,7 +232,7 @@ lib/libCEGUIOgreRenderer.so.0
lib/libOgreMain.a
lib/libOgreMain.la
lib/libOgreMain.so
-lib/libOgreMain.so.11
+lib/libOgreMain.so.12
lib/libOgrePlatform.a
lib/libOgrePlatform.la
lib/libOgrePlatform.so