From 3311ba0e866397db9139fbb7541a27e664922442 Mon Sep 17 00:00:00 2001
From: Oliver Lehmann <oliver@FreeBSD.org>
Date: Wed, 19 Sep 2007 13:45:53 +0000
Subject: [PATCH] connect repocopied ogre3d12 and cegui04 to the build

---
 graphics/Makefile          | 2 ++
 graphics/cegui04/Makefile  | 8 +++++---
 graphics/ogre3d12/Makefile | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/graphics/Makefile b/graphics/Makefile
index 3cf84f64b075..095519256aec 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -55,6 +55,7 @@
     SUBDIR += cbrpager
     SUBDIR += cbview
     SUBDIR += cegui
+    SUBDIR += cegui04
     SUBDIR += cenon
     SUBDIR += chbg
     SUBDIR += cimg
@@ -437,6 +438,7 @@
     SUBDIR += ocre
     SUBDIR += oglext
     SUBDIR += ogre3d
+    SUBDIR += ogre3d12
     SUBDIR += openclipart
     SUBDIR += opencv
     SUBDIR += opendis
diff --git a/graphics/cegui04/Makefile b/graphics/cegui04/Makefile
index bc5de4e95319..7ab01cf5fe9b 100644
--- a/graphics/cegui04/Makefile
+++ b/graphics/cegui04/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cegui
 PORTVERSION=	0.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=crayzedsgui
@@ -18,12 +18,12 @@ COMMENT=	A library providing windowing and widgets for graphics APIs
 
 LIB_DEPENDS=	IL.1:${PORTSDIR}/graphics/devil
 
+LATEST_LINK=	cegui04
 WRKSRC=		${WRKDIR}/${PORTNAME}_mk2
 CONFIGURE_ARGS=	--without-xerces-c
 GNU_CONFIGURE=	YES
-INSTALLS_SHLIB=	YES
+USE_LDCONFIG=	YES
 USE_BZIP2=	YES
-USE_GCC=	3.4
 USE_GL=		YES
 USE_XLIB=	YES
 USE_GNOME=	gnomehack
@@ -42,6 +42,8 @@ post-patch:
 		${WRKSRC}/src/CEGUIFactoryModule.cpp
 	@${REINPLACE_CMD} -e 's|(linux)|& \|\| defined(__FreeBSD__)|g' \
 		${WRKSRC}/Samples/common/src/CEGuiSample.cpp
+	@${REINPLACE_CMD} -e 's|ILvoid|void|g' \
+		${WRKSRC}/src/renderers/OpenGLGUIRenderer/opengltexture.cpp
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/ogre3d12/Makefile b/graphics/ogre3d12/Makefile
index 9ab48535dd0c..02e5e8297eed 100644
--- a/graphics/ogre3d12/Makefile
+++ b/graphics/ogre3d12/Makefile
@@ -17,8 +17,9 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A scene-oriented, flexible 3D engine written in C++
 
 LIB_DEPENDS=	zzip.13:${PORTSDIR}/devel/zziplib \
-		CEGUIBase.0:${PORTSDIR}/graphics/cegui
+		CEGUIBase.0:${PORTSDIR}/graphics/cegui04
 
+LATEST_LINK=	ogre3d12
 WRKSRC=		${WRKDIR}/ogrenew
 CONFIGURE_ARGS=	--disable-cg --program-transform-name= --enable-static --with-platform=SDL \
 		--with-cppunit-prefix=/nonexistent
@@ -30,7 +31,6 @@ USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	YES
 USE_BZIP2=	YES
 USE_XLIB=	YES
-USE_GCC=	3.4
 USE_GNOME=	gnomehack
 USE_GMAKE=	YES
 USE_SDL=	sdl