Update to 1.6.3. Not pasting the upstream changelog here, because it's a

massive (4 years of development).

16 files changed, 211 insertions, 404 deletions

diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index 81d1b3c0a24..3dd8f169c4c 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2009/08/26 19:56:44 sno Exp $
+# $NetBSD: Makefile,v 1.26 2009/09/01 16:53:40 hasso Exp $
 #
 
-DISTNAME=	ogre-v0-12-1
-PKGNAME=	ogre-0.12.1
-PKGREVISION=	9
+DISTNAME=	ogre-v1-6-3
+PKGNAME=	ogre-1.6.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ogre/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,19 +11,26 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ogre.sourceforge.net/
 COMMENT=	Object-Oriented Graphics Rendering Engine
 
-WRKSRC=			${WRKDIR}/ogrenew
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+WRKSRC=			${WRKDIR}/ogre
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake pkg-config xmkmf
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
-CONFIGURE_ARGS+=	--with-platform=SDL
+CONFIGURE_ARGS+=	--with-platform=GLX
+CONFIGURE_ARGS+=	--disable-freeimage
+CONFIGURE_ARGS+=	--disable-cg
 
 PKGCONFIG_OVERRIDE+=	OGRE.pc.in
 
+.include "../../archivers/zziplib/buildlink3.mk"
 .include "../../devel/devIL/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ogre/PLIST b/devel/ogre/PLIST
index 2006ccc958c..0a214c02d8e 100644
--- a/devel/ogre/PLIST
+++ b/devel/ogre/PLIST
@@ -1,105 +1,123 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:01 joerg Exp $
-bin/MeshUpgrader
+@comment $NetBSD: PLIST,v 1.4 2009/09/01 16:53:40 hasso Exp $
+bin/OgreMaterialUpgrade
+bin/OgreMeshUpgrade
 bin/OgreXMLConverter
+bin/rcapsdump
+include/OGRE/GLX/OgreConfigDialogImp.h
+include/OGRE/GLX/OgreErrorDialogImp.h
+include/OGRE/GLX/OgreTimerImp.h
 include/OGRE/Ogre.h
-include/OGRE/OgreActionEvent.h
-include/OGRE/OgreActionTarget.h
+include/OGRE/OgreAlignedAllocator.h
+include/OGRE/OgreAnimable.h
 include/OGRE/OgreAnimation.h
 include/OGRE/OgreAnimationState.h
 include/OGRE/OgreAnimationTrack.h
-include/OGRE/OgreArchiveEx.h
+include/OGRE/OgreAny.h
+include/OGRE/OgreArchive.h
 include/OGRE/OgreArchiveFactory.h
 include/OGRE/OgreArchiveManager.h
+include/OGRE/OgreAtomicWrappers.h
+include/OGRE/OgreAutoParamDataSource.h
 include/OGRE/OgreAxisAlignedBox.h
 include/OGRE/OgreBillboard.h
+include/OGRE/OgreBillboardChain.h
+include/OGRE/OgreBillboardParticleRenderer.h
 include/OGRE/OgreBillboardSet.h
 include/OGRE/OgreBitwise.h
 include/OGRE/OgreBlendMode.h
 include/OGRE/OgreBone.h
-include/OGRE/OgreBorderButtonGuiElement.h
-include/OGRE/OgreBorderPanelGuiElement.h
-include/OGRE/OgreButtonGuiElement.h
+include/OGRE/OgreBorderPanelOverlayElement.h
 include/OGRE/OgreCamera.h
 include/OGRE/OgreCodec.h
 include/OGRE/OgreColourValue.h
 include/OGRE/OgreCommon.h
+include/OGRE/OgreCompiler2Pass.h
+include/OGRE/OgreCompositionPass.h
+include/OGRE/OgreCompositionTargetPass.h
+include/OGRE/OgreCompositionTechnique.h
+include/OGRE/OgreCompositor.h
+include/OGRE/OgreCompositorChain.h
+include/OGRE/OgreCompositorInstance.h
+include/OGRE/OgreCompositorManager.h
+include/OGRE/OgreCompositorScriptCompiler.h
+include/OGRE/OgreCompositorSerializer.h
 include/OGRE/OgreConfig.h
 include/OGRE/OgreConfigDialog.h
 include/OGRE/OgreConfigFile.h
 include/OGRE/OgreConfigOptionMap.h
 include/OGRE/OgreController.h
 include/OGRE/OgreControllerManager.h
-include/OGRE/OgreCursor.h
-include/OGRE/OgreCursorGuiElement.h
-include/OGRE/OgreDataChunk.h
+include/OGRE/OgreConvexBody.h
+include/OGRE/OgreDDSCodec.h
+include/OGRE/OgreDataStream.h
 include/OGRE/OgreDefaultHardwareBufferManager.h
 include/OGRE/OgreDynLib.h
 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/OgreEventMulticaster.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
 include/OGRE/OgreFactoryObj.h
+include/OGRE/OgreFileSystem.h
 include/OGRE/OgreFont.h
 include/OGRE/OgreFontManager.h
 include/OGRE/OgreFrameListener.h
-include/OGRE/OgreGuiContainer.h
-include/OGRE/OgreGuiControl.h
-include/OGRE/OgreGuiElement.h
-include/OGRE/OgreGuiElementCommands.h
-include/OGRE/OgreGuiElementFactories.h
-include/OGRE/OgreGuiElementFactory.h
-include/OGRE/OgreGuiElementPrerequisites.h
-include/OGRE/OgreGuiManager.h
-include/OGRE/OgreGuiPressable.h
+include/OGRE/OgreFreeImageCodec.h
+include/OGRE/OgreFrustum.h
+include/OGRE/OgreGpuProgram.h
+include/OGRE/OgreGpuProgramManager.h
+include/OGRE/OgreGpuProgramUsage.h
 include/OGRE/OgreHardwareBuffer.h
 include/OGRE/OgreHardwareBufferManager.h
 include/OGRE/OgreHardwareIndexBuffer.h
+include/OGRE/OgreHardwareOcclusionQuery.h
+include/OGRE/OgreHardwarePixelBuffer.h
 include/OGRE/OgreHardwareVertexBuffer.h
+include/OGRE/OgreHighLevelGpuProgram.h
+include/OGRE/OgreHighLevelGpuProgramManager.h
+include/OGRE/OgreILCodecs.h
+include/OGRE/OgreILImageCodec.h
+include/OGRE/OgreILUtil.h
 include/OGRE/OgreImage.h
 include/OGRE/OgreImageCodec.h
-include/OGRE/OgreInput.h
-include/OGRE/OgreInputEvent.h
+include/OGRE/OgreInstancedGeometry.h
 include/OGRE/OgreIteratorWrappers.h
-include/OGRE/OgreJPEGCodec.h
-include/OGRE/OgreKeyEvent.h
 include/OGRE/OgreKeyFrame.h
-include/OGRE/OgreKeyTarget.h
 include/OGRE/OgreLight.h
-include/OGRE/OgreListChanger.h
-include/OGRE/OgreListGuiElement.h
-include/OGRE/OgreListSelectionEvent.h
-include/OGRE/OgreListSelectionTarget.h
 include/OGRE/OgreLog.h
 include/OGRE/OgreLogManager.h
+include/OGRE/OgreManualObject.h
 include/OGRE/OgreMaterial.h
 include/OGRE/OgreMaterialManager.h
 include/OGRE/OgreMaterialSerializer.h
 include/OGRE/OgreMath.h
 include/OGRE/OgreMatrix3.h
 include/OGRE/OgreMatrix4.h
-include/OGRE/OgreMemoryMacros.h
-include/OGRE/OgreMemoryManager.h
+include/OGRE/OgreMemoryAllocatedObject.h
+include/OGRE/OgreMemoryAllocatorConfig.h
+include/OGRE/OgreMemoryNedAlloc.h
+include/OGRE/OgreMemorySTLAllocator.h
+include/OGRE/OgreMemoryStdAlloc.h
+include/OGRE/OgreMemoryTracker.h
 include/OGRE/OgreMesh.h
 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/OgreNoMemoryMacros.h
+include/OGRE/OgreMovablePlane.h
 include/OGRE/OgreNode.h
+include/OGRE/OgreNumerics.h
+include/OGRE/OgreOptimisedUtil.h
 include/OGRE/OgreOverlay.h
+include/OGRE/OgreOverlayContainer.h
+include/OGRE/OgreOverlayElement.h
+include/OGRE/OgreOverlayElementCommands.h
+include/OGRE/OgreOverlayElementFactory.h
 include/OGRE/OgreOverlayManager.h
-include/OGRE/OgrePNGCodec.h
-include/OGRE/OgrePanelGuiElement.h
+include/OGRE/OgrePanelOverlayElement.h
 include/OGRE/OgreParticle.h
 include/OGRE/OgreParticleAffector.h
 include/OGRE/OgreParticleAffectorFactory.h
@@ -109,89 +127,116 @@ include/OGRE/OgreParticleEmitterFactory.h
 include/OGRE/OgreParticleIterator.h
 include/OGRE/OgreParticleSystem.h
 include/OGRE/OgreParticleSystemManager.h
+include/OGRE/OgreParticleSystemRenderer.h
+include/OGRE/OgrePass.h
 include/OGRE/OgrePatchMesh.h
 include/OGRE/OgrePatchSurface.h
+include/OGRE/OgrePixelFormat.h
 include/OGRE/OgrePlane.h
+include/OGRE/OgrePlaneBoundedVolume.h
 include/OGRE/OgrePlatform.h
-include/OGRE/OgrePlatformManager.h
-include/OGRE/OgrePopupMenuGuiElement.h
-include/OGRE/OgrePositionTarget.h
+include/OGRE/OgrePlatformInformation.h
+include/OGRE/OgrePlugin.h
+include/OGRE/OgrePolygon.h
+include/OGRE/OgrePose.h
 include/OGRE/OgrePredefinedControllers.h
+include/OGRE/OgrePrefabFactory.h
 include/OGRE/OgrePrerequisites.h
 include/OGRE/OgreProfiler.h
 include/OGRE/OgreProgressiveMesh.h
 include/OGRE/OgreQuaternion.h
+include/OGRE/OgreRadixSort.h
 include/OGRE/OgreRay.h
+include/OGRE/OgreRectangle.h
+include/OGRE/OgreRectangle2D.h
 include/OGRE/OgreRenderOperation.h
 include/OGRE/OgreRenderQueue.h
+include/OGRE/OgreRenderQueueInvocation.h
 include/OGRE/OgreRenderQueueListener.h
 include/OGRE/OgreRenderQueueSortingGrouping.h
 include/OGRE/OgreRenderSystem.h
 include/OGRE/OgreRenderSystemCapabilities.h
+include/OGRE/OgreRenderSystemCapabilitiesManager.h
+include/OGRE/OgreRenderSystemCapabilitiesSerializer.h
 include/OGRE/OgreRenderTarget.h
 include/OGRE/OgreRenderTargetListener.h
 include/OGRE/OgreRenderTexture.h
+include/OGRE/OgreRenderToVertexBuffer.h
 include/OGRE/OgreRenderWindow.h
 include/OGRE/OgreRenderable.h
 include/OGRE/OgreResource.h
+include/OGRE/OgreResourceBackgroundQueue.h
+include/OGRE/OgreResourceGroupManager.h
 include/OGRE/OgreResourceManager.h
-include/OGRE/OgreResourceMap.h
+include/OGRE/OgreRibbonTrail.h
 include/OGRE/OgreRoot.h
 include/OGRE/OgreRotationalSpline.h
-include/OGRE/OgreSDDataChunk.h
 include/OGRE/OgreSceneManager.h
 include/OGRE/OgreSceneManagerEnumerator.h
 include/OGRE/OgreSceneNode.h
 include/OGRE/OgreSceneQuery.h
-include/OGRE/OgreScrollBarGuiElement.h
-include/OGRE/OgreScrollEvent.h
-include/OGRE/OgreScrollTarget.h
+include/OGRE/OgreScriptCompiler.h
+include/OGRE/OgreScriptLexer.h
+include/OGRE/OgreScriptLoader.h
+include/OGRE/OgreScriptParser.h
+include/OGRE/OgreScriptTranslator.h
+include/OGRE/OgreSearchOps.h
 include/OGRE/OgreSerializer.h
+include/OGRE/OgreShadowCameraSetup.h
+include/OGRE/OgreShadowCameraSetupFocused.h
+include/OGRE/OgreShadowCameraSetupLiSPSM.h
+include/OGRE/OgreShadowCameraSetupPSSM.h
+include/OGRE/OgreShadowCameraSetupPlaneOptimal.h
+include/OGRE/OgreShadowCaster.h
+include/OGRE/OgreShadowTextureManager.h
+include/OGRE/OgreShadowVolumeExtrudeProgram.h
 include/OGRE/OgreSharedPtr.h
 include/OGRE/OgreSimpleRenderable.h
 include/OGRE/OgreSimpleSpline.h
 include/OGRE/OgreSingleton.h
 include/OGRE/OgreSkeleton.h
 include/OGRE/OgreSkeletonFileFormat.h
+include/OGRE/OgreSkeletonInstance.h
 include/OGRE/OgreSkeletonManager.h
 include/OGRE/OgreSkeletonSerializer.h
 include/OGRE/OgreSphere.h
+include/OGRE/OgreSpotShadowFadePng.h
+include/OGRE/OgreStableHeaders.h
 include/OGRE/OgreStaticFaceGroup.h
+include/OGRE/OgreStaticGeometry.h
 include/OGRE/OgreStdHeaders.h
 include/OGRE/OgreString.h
 include/OGRE/OgreStringConverter.h
 include/OGRE/OgreStringInterface.h
-include/OGRE/OgreStringResource.h
 include/OGRE/OgreStringVector.h
 include/OGRE/OgreSubEntity.h
 include/OGRE/OgreSubMesh.h
-include/OGRE/OgreTGACodec.h
-include/OGRE/OgreTTYGuiElement.h
 include/OGRE/OgreTagPoint.h
-include/OGRE/OgreTargetManager.h
-include/OGRE/OgreTextAreaGuiElement.h
-include/OGRE/OgreTextBoxGuiElement.h
+include/OGRE/OgreTangentSpaceCalc.h
+include/OGRE/OgreTechnique.h
+include/OGRE/OgreTextAreaOverlayElement.h
 include/OGRE/OgreTexture.h
 include/OGRE/OgreTextureManager.h
+include/OGRE/OgreTextureUnitState.h
 include/OGRE/OgreTimer.h
+include/OGRE/OgreUTFString.h
+include/OGRE/OgreUnifiedHighLevelGpuProgram.h
 include/OGRE/OgreUserDefinedObject.h
+include/OGRE/OgreVector2.h
 include/OGRE/OgreVector3.h
+include/OGRE/OgreVector4.h
 include/OGRE/OgreVertexBoneAssignment.h
 include/OGRE/OgreVertexIndexData.h
 include/OGRE/OgreViewport.h
+include/OGRE/OgreWindowEventUtilities.h
 include/OGRE/OgreWireBoundingBox.h
 include/OGRE/OgreZip.h
-include/OGRE/OgreZipArchiveFactory.h
 include/OGRE/asm_math.h
-include/OGRE/unzip.h
-lib/OGRE/Plugin_BSPSceneManager.so
-lib/OGRE/Plugin_FileSystem.so
-lib/OGRE/Plugin_GuiElements.so
-lib/OGRE/Plugin_NatureSceneManager.so
-lib/OGRE/Plugin_OctreeSceneManager.so
-lib/OGRE/Plugin_ParticleFX.so
-lib/OGRE/RenderSystem_GL.so
+lib/OGRE/Plugin_BSPSceneManager.la
+lib/OGRE/Plugin_OctreeSceneManager.la
+lib/OGRE/Plugin_OctreeZone.la
+lib/OGRE/Plugin_ParticleFX.la
+lib/OGRE/RenderSystem_GL.la
+lib/OGRE/libPlugin_PCZSceneManager.la
 lib/libOgreMain.la
-lib/libOgrePlatform.so
 lib/pkgconfig/OGRE.pc
-share/OGRE/ogre-config.glade
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index 05a094a0d92..7a548f1391e 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,18 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/08/26 19:56:44 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/09/01 16:53:40 hasso Exp $
 
 BUILDLINK_TREE+=	ogre
 
 .if !defined(OGRE_BUILDLINK3_MK)
 OGRE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ogre+=	ogre>=0.12.1nb1
-BUILDLINK_ABI_DEPENDS.ogre+=	ogre>=0.12.1nb9
+BUILDLINK_API_DEPENDS.ogre+=	ogre>=1.6.3
+BUILDLINK_ABI_DEPENDS.ogre+=	ogre>=1.6.3
 BUILDLINK_PKGSRCDIR.ogre?=	../../devel/ogre
 
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../archivers/zziplib/buildlink3.mk"
 .include "../../devel/devIL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
 .endif # OGRE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ogre
diff --git a/devel/ogre/distinfo b/devel/ogre/distinfo
index 99c5b3b464f..f6c1418e521 100644
--- a/devel/ogre/distinfo
+++ b/devel/ogre/distinfo
@@ -1,17 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/12/13 10:41:06 rillig Exp $
+$NetBSD: distinfo,v 1.6 2009/09/01 16:53:40 hasso Exp $
 
-SHA1 (ogre-v0-12-1.tar.bz2) = ffabeeb66305182ca3c7f2d9ee5a700599afd0db
-RMD160 (ogre-v0-12-1.tar.bz2) = 34c4e3bfa6d29591c53e0a533fb65ee5a4a5be01
-Size (ogre-v0-12-1.tar.bz2) = 13718569 bytes
-SHA1 (patch-aa) = f091507e8f84385a1ce2e78bd811189006fdb449
-SHA1 (patch-ab) = d2d6e3482391d6b5562a9cfdb302adc2911686b2
-SHA1 (patch-ac) = bfe1bfd9c2033cb75dd5db97ce930e419a649639
-SHA1 (patch-ad) = 14bb9fc366b02292200c39d24c609a019271c6e9
-SHA1 (patch-ae) = 6834759ac02fdf555dfa3fe482bddc914e10fa62
-SHA1 (patch-af) = b7e359ccdee4a3a99aa633a8e79e3bea1ca1939b
-SHA1 (patch-ba) = 7a772416225fea38a5855875d52ba21c3719e8b0
-SHA1 (patch-bb) = cc103295337e4a639cf8b590395ac6737a8ced1c
-SHA1 (patch-bc) = f9ad93204168b975a25c34e6a25358c89d2a38c2
-SHA1 (patch-bd) = 99b39512c43481b2c5e12d2d95de8f3db6ee08ab
-SHA1 (patch-be) = 66420c305094b3dd98c53f9f81f1c35c3022826c
-SHA1 (patch-bf) = c56944b447e967b8cc67a399ee4f1d6d2966e2b8
+SHA1 (ogre-v1-6-3.tar.bz2) = 0bde8f8d982151c561e9e6c9ccb51e0d19b5eab6
+RMD160 (ogre-v1-6-3.tar.bz2) = e1e16c152d5cb3141e306e4886092b5675695e9a
+Size (ogre-v1-6-3.tar.bz2) = 41790055 bytes
+SHA1 (patch-aa) = b015c3270699301dacf42655c9309da9eb71c9c7
diff --git a/devel/ogre/patches/patch-aa b/devel/ogre/patches/patch-aa
index a1a80f59488..75f3b052d64 100644
--- a/devel/ogre/patches/patch-aa
+++ b/devel/ogre/patches/patch-aa
@@ -1,150 +1,73 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/03 19:01:47 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2009/09/01 16:53:40 hasso Exp $
 
---- OgreMain/include/unzip.h.orig	2003-10-12 21:19:24.000000000 +0200
-+++ OgreMain/include/unzip.h	2003-10-12 21:22:38.000000000 +0200
-@@ -111,9 +111,9 @@
-     tm_unz tmu_date;
- } unz_file_info;
- 
--extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-+extern int ZEXPORT unzStringFileNameCompare (const char* fileName1,
-                                                  const char* fileName2,
--                                                 int iCaseSensitivity));
-+                                                 int iCaseSensitivity);
- /*
-    Compare two filename (fileName1,fileName2).
-    If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-@@ -124,7 +124,7 @@
- */
- 
- 
--extern unzFile ZEXPORT unzOpen OF((const char *path));
-+extern unzFile ZEXPORT unzOpen (const char *path);
- /*
-   Open a Zip file. path contain the full pathname (by example,
-      on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
-@@ -135,24 +135,24 @@
-        of this unzip package.
- */
- 
--extern int ZEXPORT unzClose OF((unzFile file));
-+extern int ZEXPORT unzClose (unzFile file);
- /*
-   Close a ZipFile opened with unzipOpen.
-   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-   return UNZ_OK if there is no problem. */
- 
--extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
--                    unz_global_info *pglobal_info));
-+extern int ZEXPORT unzGetGlobalInfo (unzFile file,
-+                    unz_global_info *pglobal_info);
- /*
-   Write info about the ZipFile in the *pglobal_info structure.
-   No preparation of the structure is needed
-   return UNZ_OK if there is no problem. */
- 
- 
--extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-+extern int ZEXPORT unzGetGlobalComment (unzFile file,
-                                            char *szComment,
--                       uLong uSizeBuf));
-+                       uLong uSizeBuf);
- /*
-   Get the global comment string of the ZipFile, in the szComment buffer.
-   uSizeBuf is the size of the szComment buffer.
-@@ -163,22 +163,22 @@
- /***************************************************************************/
- /* Unzip package allow you browse the directory of the zipfile */
- 
--extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-+extern int ZEXPORT unzGoToFirstFile (unzFile file);
- /*
-   Set the current file of the zipfile to the first file.
-   return UNZ_OK if there is no problem
- */
- 
--extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-+extern int ZEXPORT unzGoToNextFile (unzFile file);
- /*
-   Set the current file of the zipfile to the next file.
-   return UNZ_OK if there is no problem
-   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
- */
- 
--extern int ZEXPORT unzLocateFile OF((unzFile file,
-+extern int ZEXPORT unzLocateFile (unzFile file,
-                      const char *szFileName,
--                     int iCaseSensitivity));
-+                     int iCaseSensitivity);
- /*
-   Try locate the file szFileName in the zipfile.
-   For the iCaseSensitivity signification, see unzStringFileNameCompare
-@@ -189,14 +189,14 @@
- */
- 
- 
--extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-+extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
-                          unz_file_info *pfile_info,
-                          char *szFileName,
-                          uLong fileNameBufferSize,
-                          void *extraField,
-                          uLong extraFieldBufferSize,
-                          char *szComment,
--                         uLong commentBufferSize));
-+                         uLong commentBufferSize);
- /*
-   Get Info about the current file
-   if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-@@ -215,22 +215,22 @@
-    from it, and close it (you can close it before reading all the file)
-    */
- 
--extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzOpenCurrentFile (unzFile file);
- /*
-   Open for reading data the current file in the zipfile.
-   If there is no error, the return value is UNZ_OK.
- */
- 
--extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzCloseCurrentFile (unzFile file);
- /*
-   Close the file in zip opened with unzOpenCurrentFile
-   Return UNZ_CRCERROR if all the file was read but the CRC is not good
- */
- 
- 
--extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
-+extern int ZEXPORT unzReadCurrentFile (unzFile file,
-                       voidp buf,
--                      unsigned len));
-+                      unsigned len);
- /*
-   Read bytes from the current file (opened by unzOpenCurrentFile)
-   buf contain buffer where data must be copied
-@@ -242,19 +242,19 @@
-     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
- */
- 
--extern z_off_t ZEXPORT unztell OF((unzFile file));
-+extern z_off_t ZEXPORT unztell (unzFile file);
- /*
-   Give the current position in uncompressed data
- */
- 
--extern int ZEXPORT unzeof OF((unzFile file));
-+extern int ZEXPORT unzeof (unzFile file);
- /*
-   return 1 if the end of file was reached, 0 elsewhere
- */
- 
--extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-+extern int ZEXPORT unzGetLocalExtrafield (unzFile file,
-                                              voidp buf,
--                                             unsigned len));
-+                                             unsigned len);
- /*
-   Read extra field from the current file (opened by unzOpenCurrentFile)
-   This is the local-header version of the extra field (sometimes, there is
+--- configure.orig	2009-08-31 16:44:00 +0300
++++ configure	2009-08-31 16:45:14 +0300
+@@ -25739,11 +25739,11 @@ fi
+     rm -f OgreMain/src/OgreConfigDialog.lo OgreMain/src/OgreErrorDialog.lo
+ 
+     # Prefer win32, then Xt. gtk is being phased out and must be explicitly specified.
+-    if test "x$with_gui" == "xauto" && test "x$OGRE_PLATFORM" == "xWIN32"; then
++    if test "x$with_gui" = "xauto" && test "x$OGRE_PLATFORM" = "xWIN32"; then
+         with_gui=win32
+     fi
+ 
+-    if test "x$with_gui" == "xgtk"; then
++    if test "x$with_gui" = "xgtk"; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GTK" >&5
+@@ -25825,15 +25825,15 @@ echo "${ECHO_T}yes" >&6; }
+ fi
+     fi
+ 
+-    if test "x$with_gui" == "xauto"; then
++    if test "x$with_gui" = "xauto"; then
+         with_gui=Xt
+     fi
+ 
+-    if test "x$with_gui" == "xwin32"; then
++    if test "x$with_gui" = "xwin32"; then
+         OGRE_GUI=WIN32
+-    elif test "x$with_gui" == "xgtk"; then
++    elif test "x$with_gui" = "xgtk"; then
+         OGRE_GUI=gtk
+-    elif test "x$with_gui" == "xXt"; then
++    elif test "x$with_gui" = "xXt"; then
+         OGRE_GUI=GLX
+         PLATFORM_LIBS="$PLATFORM_LIBS -lXt -lSM -lICE"
+     else
+@@ -26708,14 +26708,14 @@ else
+   with_allocator=ned
+ fi
+ 
+-    if test "x$with_allocator" == "xstd"; then
++    if test "x$with_allocator" = "xstd"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define OGRE_MEMORY_ALLOCATOR 1
+ _ACEOF
+ 
+     fi
+-    if test "x$with_allocator" == "xned"; then
++    if test "x$with_allocator" = "xned"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define OGRE_MEMORY_ALLOCATOR 2
+@@ -29360,7 +29360,7 @@ fi
+ 
+ 
+ ft_detected=yes
+-test "x$no_ft" == "xyes" && ft_detected=no
++test "x$no_ft" = "xyes" && ft_detected=no
+ 
+ echo "--------=== Configuration summary ===--------"
+ echo "    Target platform                 : $OGRE_PLATFORM"
+@@ -29374,7 +29374,7 @@ echo "    Use FreeType                  
+ echo "    Use FreeImage                   : $build_freeimage"
+ echo "    Use DevIL                       : $build_il"
+ echo "    Build OGRE demos                : $build_ogre_demos"
+-test "x$build_ogre_demos" == "xyes" && \
++test "x$build_ogre_demos" = "xyes" && \
+ echo "    Build CEGUI demos               : $build_cegui_sample"
+ echo "    Build the OpenEXR plugin        : $build_exr"
+ echo "    Build the Cg plugin             : $build_cg"
diff --git a/devel/ogre/patches/patch-ab b/devel/ogre/patches/patch-ab
deleted file mode 100644
index 31067229462..00000000000
--- a/devel/ogre/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/03 19:01:47 xtraeme Exp $
-
---- OgreMain/src/unzip.c.orig	2003-10-12 21:26:06.000000000 +0200
-+++ OgreMain/src/unzip.c	2003-10-12 21:26:36.000000000 +0200
-@@ -493,7 +493,7 @@
- /*
-   Get Info about the current file in the zipfile, with internal only info
- */
--local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-+local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
-                                                   unz_file_info *pfile_info,
-                                                   unz_file_info_internal 
-                                                   *pfile_info_internal,
-@@ -502,7 +502,7 @@
-                                                   void *extraField,
-                                                   uLong extraFieldBufferSize,
-                                                   char *szComment,
--                                                  uLong commentBufferSize));
-+                                                  uLong commentBufferSize);
- 
- local int unzlocal_GetCurrentFileInfoInternal (file,
-                                               pfile_info,
diff --git a/devel/ogre/patches/patch-ac b/devel/ogre/patches/patch-ac
deleted file mode 100644
index 2d280bc027e..00000000000
--- a/devel/ogre/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/02/27 14:50:19 jmmv Exp $
-
---- configure.orig	2003-10-12 22:56:56.000000000 +0200
-+++ configure
-@@ -8485,7 +8485,7 @@ _ACEOF
- echo "${ECHO_T}yes" >&6;
-     else
-         echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6!
-+echo "${ECHO_T}no" >&6;
-     fi
- fi
- 
diff --git a/devel/ogre/patches/patch-ad b/devel/ogre/patches/patch-ad
deleted file mode 100644
index 173a0784b31..00000000000
--- a/devel/ogre/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/05/19 14:32:43 joerg Exp $
-
---- OgreMain/src/OgreParticleSystemManager.cpp.orig	2006-05-19 13:33:18.000000000 +0000
-+++ OgreMain/src/OgreParticleSystemManager.cpp
-@@ -34,7 +34,7 @@ http://www.gnu.org/copyleft/lesser.txt.
- 
- 
- namespace Ogre {
--    ParticleSystemManager* Singleton<ParticleSystemManager>::ms_Singleton = 0;
-+    template <> ParticleSystemManager* Singleton<ParticleSystemManager>::ms_Singleton = 0;
-     //-----------------------------------------------------------------------
-     ParticleSystemManager::ParticleSystemManager()
-     {
diff --git a/devel/ogre/patches/patch-ae b/devel/ogre/patches/patch-ae
deleted file mode 100644
index d1fafe7c0fc..00000000000
--- a/devel/ogre/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/05/19 14:32:43 joerg Exp $
-
---- Samples/Nature/src/Makefile.in.orig	2006-05-19 13:58:59.000000000 +0000
-+++ Samples/Nature/src/Makefile.in
-@@ -160,7 +160,7 @@ INCLUDES = $(STLPORT_CFLAGS) -I$(top_src
- noinst_PROGRAMS = Nature 
- Nature_SOURCES = Nature.cpp
- Nature_LDFLAGS = -L$(top_srcdir)/OgreMain/src
--Nature_LDADD = -lOgreMain -lpthread
-+Nature_LDADD = -lOgreMain ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- subdir = Samples/Nature/src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/devel/ogre/patches/patch-af b/devel/ogre/patches/patch-af
deleted file mode 100644
index 4583352d156..00000000000
--- a/devel/ogre/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/05/19 14:32:43 joerg Exp $
-
---- Samples/Terrain/src/Makefile.in.orig	2006-05-19 13:59:22.000000000 +0000
-+++ Samples/Terrain/src/Makefile.in
-@@ -160,7 +160,7 @@ INCLUDES = $(STLPORT_CFLAGS) -I$(top_src
- noinst_PROGRAMS = Terrain 
- Terrain_SOURCES = Terrain.cpp
- Terrain_LDFLAGS = -L$(top_srcdir)/OgreMain/src
--Terrain_LDADD = -lOgreMain -lpthread
-+Terrain_LDADD = -lOgreMain ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- subdir = Samples/Terrain/src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/devel/ogre/patches/patch-ba b/devel/ogre/patches/patch-ba
deleted file mode 100644
index f5207fa9ede..00000000000
--- a/devel/ogre/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2007/12/13 10:41:07 rillig Exp $
-
---- OgreMain/include/OgreFontManager.h.orig	2002-10-26 16:49:51.000000000 +0000
-+++ OgreMain/include/OgreFontManager.h	2007-10-10 10:41:17.000000000 +0000
-@@ -61,7 +61,7 @@ namespace Ogre
-                 This method just delegates to the template version anyway, but the implementation stays in this
-                 single compilation unit, preventing link errors.
-         */
--        static FontManager& FontManager::getSingleton(void);
-+        static FontManager& getSingleton(void);
- 
-     protected:
- 
diff --git a/devel/ogre/patches/patch-bb b/devel/ogre/patches/patch-bb
deleted file mode 100644
index 71b9d565af8..00000000000
--- a/devel/ogre/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2007/12/13 10:41:07 rillig Exp $
-
---- OgreMain/include/OgreRenderTarget.h.orig	2003-09-12 19:00:43.000000000 +0000
-+++ OgreMain/include/OgreRenderTarget.h	2007-10-10 10:39:46.000000000 +0000
-@@ -215,7 +215,7 @@ namespace Ogre {
-         virtual void setDebugText(const String& text);
- 
- 		/** Returns the debug text. */
--		const String& RenderTarget::getDebugText() const;
-+		const String& getDebugText() const;
- 
-         /** Add a listener to this RenderTarget which will be called back before & after rendering.
-         @remarks
diff --git a/devel/ogre/patches/patch-bc b/devel/ogre/patches/patch-bc
deleted file mode 100644
index b00f2356a35..00000000000
--- a/devel/ogre/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2007/12/13 10:41:07 rillig Exp $
-
---- PlugIns/GuiElements/include/OgreBorderPanelGuiElement.h.orig	2003-09-16 03:35:09.000000000 +0000
-+++ PlugIns/GuiElements/include/OgreBorderPanelGuiElement.h	2007-10-10 10:48:59.000000000 +0000
-@@ -31,7 +31,7 @@ http://www.gnu.org/copyleft/lesser.txt.
- 
- namespace Ogre {
- 
--
-+    class BorderRenderable;
-     
-     /** A specialisation of the PanelGuiElement to provide a panel with a border.
-     @remarks
diff --git a/devel/ogre/patches/patch-bd b/devel/ogre/patches/patch-bd
deleted file mode 100644
index 4c0c946e490..00000000000
--- a/devel/ogre/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2007/12/13 10:41:08 rillig Exp $
-
---- PlugIns/NatureSceneManager/include/NatureTerrainPatch.h.orig	2003-09-10 22:48:22.000000000 +0000
-+++ PlugIns/NatureSceneManager/include/NatureTerrainPatch.h	2007-10-10 10:55:35.000000000 +0000
-@@ -146,7 +146,7 @@ private:
-     void getNormal(int x, int z, Vector3 *normal);
- 
-     /// Adds a vertex to the vertex buffer or returns its index if it
--    inline int NatureTerrainPatch::addVertex(int x, int y, int z)
-+    inline int addVertex(int x, int y, int z)
-     {
-         unsigned int idx = z * QUADTREE_SIZE + x;
-         unsigned int v = mManager->mVertexLookup[idx];
diff --git a/devel/ogre/patches/patch-be b/devel/ogre/patches/patch-be
deleted file mode 100644
index a02b91320dd..00000000000
--- a/devel/ogre/patches/patch-be
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-be,v 1.1 2007/12/13 10:41:08 rillig Exp $
-
---- Tools/XMLConverter/include/OgreXMLSkeletonSerializer.h.orig	2003-02-18 22:07:41.000000000 +0000
-+++ Tools/XMLConverter/include/OgreXMLSkeletonSerializer.h	2007-10-10 10:59:27.000000000 +0000
-@@ -72,11 +72,11 @@ namespace Ogre {
-         void writeAnimationTrack(TiXmlElement* tracksNode, const AnimationTrack* track);
-         void writeKeyFrame(TiXmlElement* keysNode, const KeyFrame* key);
- 		
--		void XMLSkeletonSerializer::readBones(Skeleton* skel, TiXmlElement* mBonesNode);
--		void XMLSkeletonSerializer::readBones2(Skeleton* skel, TiXmlElement* mBonesNode);
-+		void readBones(Skeleton* skel, TiXmlElement* mBonesNode);
-+		void readBones2(Skeleton* skel, TiXmlElement* mBonesNode);
- 		void createHierarchy(Skeleton* skel, TiXmlElement* mHierNode);
--		void XMLSkeletonSerializer::readKeyFrames(AnimationTrack* track, TiXmlElement* mKeyfNode);
--		void XMLSkeletonSerializer::readAnimations(Skeleton* skel, TiXmlElement* mAnimNode) ;
-+		void readKeyFrames(AnimationTrack* track, TiXmlElement* mKeyfNode);
-+		void readAnimations(Skeleton* skel, TiXmlElement* mAnimNode) ;
- 
-     };
- 
diff --git a/devel/ogre/patches/patch-bf b/devel/ogre/patches/patch-bf
deleted file mode 100644
index df34f238289..00000000000
--- a/devel/ogre/patches/patch-bf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2007/12/13 10:41:08 rillig Exp $
-
---- Tools/XMLConverter/include/tinyxml.h.orig	2003-09-10 22:48:29.000000000 +0000
-+++ Tools/XMLConverter/include/tinyxml.h	2007-10-10 10:57:56.000000000 +0000
-@@ -790,7 +790,7 @@ public:
- #endif
- 
- 	/// Construct.
--	TiXmlDeclaration::TiXmlDeclaration( const char * _version,
-+	TiXmlDeclaration( const char * _version,
- 										const char * _encoding,
- 										const char * _standalone );
-