update to 1.4.4

do not force the usage of gcc 3.4, the ports are now gcc 4 ready

3 files changed, 42 insertions, 34 deletions

diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index 9ab48535dd0c..7debf93c4f12 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ogre3d
-PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTVERSION=	1.4.4
+PORTREVISION=	0
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=ogre
@@ -17,11 +17,12 @@ 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.1:${PORTSDIR}/graphics/cegui \
+		IL.1:${PORTSDIR}/graphics/devil
 
 WRKSRC=		${WRKDIR}/ogrenew
-CONFIGURE_ARGS=	--disable-cg --program-transform-name= --enable-static --with-platform=SDL \
-		--with-cppunit-prefix=/nonexistent
+CONFIGURE_ARGS=	--disable-cg --program-transform-name= --enable-static \
+		--with-cppunit-prefix=/nonexistent --disable-freeimage
 CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -DNDEBUG" \
 		ZZIPLIB_CFLAGS="-I${LOCALBASE}/include" \
 		ZZIPLIB_LIBS="-L${LOCALBASE}/lib -lzzip"
@@ -30,7 +31,7 @@ USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	YES
 USE_BZIP2=	YES
 USE_XLIB=	YES
-USE_GCC=	3.4
+#USE_GCC=	3.4
 USE_GNOME=	gnomehack
 USE_GMAKE=	YES
 USE_SDL=	sdl
@@ -40,7 +41,9 @@ post-patch:
 		s|sdl-config|${SDL_CONFIG}|g; \
 		s|-lpthread|${PTHREAD_LIBS}|g; \
 		s|"-lIL|"-L${LOCALBASE}/lib -lIL|g; \
-		s|-lGL -lGLU|-L${X11BASE}/lib &|g' \
+		s|-lGL -lGLU|-L${X11BASE}/lib &|g; \
+		s|" == "x|" = "x|g; \
+		s|-lfreeimage|-L${LOCALBASE}/lib &|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|<CEGUI/|<|g' \
 		${WRKSRC}/Samples/Gui/src/Gui.cpp \
@@ -51,10 +54,11 @@ post-patch:
 		${WRKSRC}/Samples/Common/CEGUIRenderer/src/OgreCEGUIResourceProvider.cpp \
 		${WRKSRC}/Samples/Common/CEGUIRenderer/src/OgreCEGUITexture.cpp
 	@${REINPLACE_CMD} -e 's| -Wl,-z,defs||' \
-		${WRKSRC}/PlatformManagers/SDL/src/Makefile.in \
 		${WRKSRC}/PlugIns/BSPSceneManager/src/Makefile.in \
-		${WRKSRC}/PlugIns/ParticleFX/src/Makefile.in \
+		${WRKSRC}/PlugIns/CgProgramManager/src/Makefile.in \
+		${WRKSRC}/PlugIns/EXRCodec/src/Makefile.in \
 		${WRKSRC}/PlugIns/OctreeSceneManager/src/Makefile.in \
+		${WRKSRC}/PlugIns/ParticleFX/src/Makefile.in \
 		${WRKSRC}/RenderSystems/GL/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/Samples/Terrain/src/Makefile.in
@@ -64,6 +68,7 @@ post-patch:
 		s,defined(__x86_64__),& || defined(__powerpc__) || defined(__ia64__) || defined(__sparc64__) || defined(__alpha__) || defined(__amd64__),' \
 		${WRKSRC}/OgreMain/include/OgrePlatform.h
 
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/graphics/ogre3d/distinfo b/graphics/ogre3d/distinfo
index 28c72bf8b340..e4ba81d4133b 100644
--- a/graphics/ogre3d/distinfo
+++ b/graphics/ogre3d/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogre-linux_osx-v1-2-5.tar.bz2) = b4c9c0e6dda14009c8e7a29de876d9a1
-SHA256 (ogre-linux_osx-v1-2-5.tar.bz2) = 9c7a31d41b626ff276b975f52395d17ee561e2d1dbcf1f6698fcb25c154d2d33
-SIZE (ogre-linux_osx-v1-2-5.tar.bz2) = 22994042
+MD5 (ogre-linux_osx-v1-4-4.tar.bz2) = 456b75d21bc09d9cee937e3ccf9fbced
+SHA256 (ogre-linux_osx-v1-4-4.tar.bz2) = 0d0b67995ef362af8de51b99b97e96709da5d2e671de489dc02009426a910adf
+SIZE (ogre-linux_osx-v1-4-4.tar.bz2) = 29260965
diff --git a/graphics/ogre3d/pkg-plist b/graphics/ogre3d/pkg-plist
index d06c729406eb..a5b85771b355 100644
--- a/graphics/ogre3d/pkg-plist
+++ b/graphics/ogre3d/pkg-plist
@@ -1,6 +1,28 @@
 bin/OgreMaterialUpgrade
 bin/OgreMeshUpgrade
 bin/OgreXMLConverter
+include/OGRE/GLX/OgreConfigDialogImp.h
+include/OGRE/GLX/OgreErrorDialogImp.h
+include/OGRE/GLX/OgreTimerImp.h
+include/OGRE/OgreAlignedAllocator.h
+include/OGRE/OgreConvexBody.h
+include/OGRE/OgreDDSCodec.h
+include/OGRE/OgreFreeImageCodec.h
+include/OGRE/OgreILUtil.h
+include/OGRE/OgreInstancedGeometry.h
+include/OGRE/OgreMaterialScriptCompiler.h
+include/OGRE/OgreNumerics.h
+include/OGRE/OgrePlugin.h
+include/OGRE/OgrePolygon.h
+include/OGRE/OgrePrefabFactory.h
+include/OGRE/OgreShadowCameraSetup.h
+include/OGRE/OgreShadowCameraSetupFocused.h
+include/OGRE/OgreShadowCameraSetupLiSPSM.h
+include/OGRE/OgreShadowCameraSetupPlaneOptimal.h
+include/OGRE/OgreShadowTextureManager.h
+include/OGRE/OgreUnifiedHighLevelGpuProgram.h
+include/OGRE/OgreUTFString.h
+include/OGRE/OgreWindowEventUtilities.h
 include/OGRE/Ogre.h
 include/OGRE/OgreAnimable.h
 include/OGRE/OgreAnimation.h
@@ -43,7 +65,6 @@ include/OGRE/OgreConfigFile.h
 include/OGRE/OgreConfigOptionMap.h
 include/OGRE/OgreController.h
 include/OGRE/OgreControllerManager.h
-include/OGRE/OgreCursor.h
 include/OGRE/OgreDataStream.h
 include/OGRE/OgreDefaultHardwareBufferManager.h
 include/OGRE/OgreDynLib.h
@@ -51,11 +72,6 @@ include/OGRE/OgreDynLibManager.h
 include/OGRE/OgreEdgeListBuilder.h
 include/OGRE/OgreEntity.h
 include/OGRE/OgreErrorDialog.h
-include/OGRE/OgreEventDispatcher.h
-include/OGRE/OgreEventListeners.h
-include/OGRE/OgreEventProcessor.h
-include/OGRE/OgreEventQueue.h
-include/OGRE/OgreEventTarget.h
 include/OGRE/OgreException.h
 include/OGRE/OgreExternalTextureSource.h
 include/OGRE/OgreExternalTextureSourceManager.h
@@ -80,12 +96,8 @@ include/OGRE/OgreILCodecs.h
 include/OGRE/OgreILImageCodec.h
 include/OGRE/OgreImage.h
 include/OGRE/OgreImageCodec.h
-include/OGRE/OgreInput.h
-include/OGRE/OgreInputEvent.h
 include/OGRE/OgreIteratorWrappers.h
-include/OGRE/OgreKeyEvent.h
 include/OGRE/OgreKeyFrame.h
-include/OGRE/OgreKeyTarget.h
 include/OGRE/OgreLight.h
 include/OGRE/OgreLog.h
 include/OGRE/OgreLogManager.h
@@ -103,9 +115,6 @@ include/OGRE/OgreMeshFileFormat.h
 include/OGRE/OgreMeshManager.h
 include/OGRE/OgreMeshSerializer.h
 include/OGRE/OgreMeshSerializerImpl.h
-include/OGRE/OgreMouseEvent.h
-include/OGRE/OgreMouseMotionTarget.h
-include/OGRE/OgreMouseTarget.h
 include/OGRE/OgreMovableObject.h
 include/OGRE/OgreMovablePlane.h
 include/OGRE/OgreNoMemoryMacros.h
@@ -134,9 +143,7 @@ include/OGRE/OgrePixelFormat.h
 include/OGRE/OgrePlane.h
 include/OGRE/OgrePlaneBoundedVolume.h
 include/OGRE/OgrePlatform.h
-include/OGRE/OgrePlatformManager.h
 include/OGRE/OgrePose.h
-include/OGRE/OgrePositionTarget.h
 include/OGRE/OgrePredefinedControllers.h
 include/OGRE/OgrePrerequisites.h
 include/OGRE/OgreProfiler.h
@@ -196,7 +203,6 @@ include/OGRE/OgreStringVector.h
 include/OGRE/OgreSubEntity.h
 include/OGRE/OgreSubMesh.h
 include/OGRE/OgreTagPoint.h
-include/OGRE/OgreTargetManager.h
 include/OGRE/OgreTechnique.h
 include/OGRE/OgreTextAreaOverlayElement.h
 include/OGRE/OgreTexture.h
@@ -228,20 +234,17 @@ lib/OGRE/RenderSystem_GL.so
 lib/libCEGUIOgreRenderer.a
 lib/libCEGUIOgreRenderer.la
 lib/libCEGUIOgreRenderer.so
-lib/libCEGUIOgreRenderer.so.0
+lib/libCEGUIOgreRenderer-1.4.4.so
 lib/libOgreMain.a
 lib/libOgreMain.la
 lib/libOgreMain.so
-lib/libOgreMain.so.13
-lib/libOgrePlatform.a
-lib/libOgrePlatform.la
-lib/libOgrePlatform.so
+lib/libOgreMain-1.4.4.so
 libdata/pkgconfig/CEGUI-OGRE.pc
 libdata/pkgconfig/OGRE.pc
-share/OGRE/ogre-config.glade
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
+@dirrm include/OGRE/GLX
 @dirrm include/OGRE
 @dirrm lib/OGRE
 @dirrm share/OGRE