unbreak after libtool mega-patch

Approved by:	portmgr

6 files changed, 36 insertions, 54 deletions

diff --git a/graphics/ogre312/Makefile b/graphics/ogre312/Makefile
index b8c7b173fa05..5fa6f4391195 100644
--- a/graphics/ogre312/Makefile
+++ b/graphics/ogre312/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	zzip.10:${PORTSDIR}/devel/zziplib \
 		CEGUIBase.0:${PORTSDIR}/graphics/cegui
 
 WRKSRC=		${WRKDIR}/ogrenew
-CONFIGURE_ARGS=	--disable-cg --program-transform-name=
-USE_REINPLACE=	YES
+CONFIGURE_ARGS=	--disable-cg --program-transform-name= --enable-static
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
@@ -38,22 +37,6 @@ post-patch:
 		s|-lGL -lGLU|-L${X11BASE}/lib &|g; \
 		s|GLSUPPORT_CFLAGS=\$$SDL_CFLAGS|GLSUPPORT_CFLAGS="-I${X11BASE}/include \$$SDL_CFLAGS"|' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '\
-		s|\(-L$$(top_builddir)/OgreMain/src\)\([$$ ]*\)|\1/.libs\2|; \
-		s|\$$(INSTALL_PROGRAM) .libs/|\$$(INSTALL_PROGRAM) |' \
-		${WRKSRC}/Samples/*/src/Makefile.in \
-		${WRKSRC}/Tools/*/src/Makefile.in
-	@${REINPLACE_CMD} -e '\
-		s|\(-L$$(top_builddir)/OgreMain/src\)\([$$ ]*\)|\1/.libs\2|' \
-		${WRKSRC}/PlatformManagers/SDL/src/Makefile.in \
-		${WRKSRC}/PlugIns/BSPSceneManager/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|-L$$(top_builddir)/Samples/Common/CEGUIRenderer/src|&/.libs|' \
-		${WRKSRC}/Samples/Gui/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|<CEGUI/|<|g' \
 		${WRKSRC}/Samples/Gui/src/Gui.cpp \
 		${WRKSRC}/Samples/Common/CEGUIRenderer/include/OgreCEGUIResourceProvider.h \
@@ -62,6 +45,12 @@ post-patch:
 		${WRKSRC}/Samples/Common/CEGUIRenderer/src/OgreCEGUIRenderer.cpp \
 		${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/OctreeSceneManager/src/Makefile.in \
+		${WRKSRC}/RenderSystems/GL/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/Samples/Terrain/src/Makefile.in
 	@${REINPLACE_CMD} -e '\
diff --git a/graphics/ogre312/pkg-plist b/graphics/ogre312/pkg-plist
index 3a1701bb71f8..523f0696c603 100644
--- a/graphics/ogre312/pkg-plist
+++ b/graphics/ogre312/pkg-plist
@@ -196,12 +196,16 @@ include/OGRE/OgreViewport.h
 include/OGRE/OgreWireBoundingBox.h
 include/OGRE/OgreZip.h
 include/OGRE/asm_math.h
+lib/OGRE/Plugin_BSPSceneManager.a
 lib/OGRE/Plugin_BSPSceneManager.la
 lib/OGRE/Plugin_BSPSceneManager.so
+lib/OGRE/Plugin_OctreeSceneManager.a
 lib/OGRE/Plugin_OctreeSceneManager.la
 lib/OGRE/Plugin_OctreeSceneManager.so
+lib/OGRE/Plugin_ParticleFX.a
 lib/OGRE/Plugin_ParticleFX.la
 lib/OGRE/Plugin_ParticleFX.so
+lib/OGRE/RenderSystem_GL.a
 lib/OGRE/RenderSystem_GL.la
 lib/OGRE/RenderSystem_GL.so
 lib/libCEGUIOgreRenderer.a
@@ -212,6 +216,7 @@ lib/libOgreMain.a
 lib/libOgreMain.la
 lib/libOgreMain.so
 lib/libOgreMain.so.9
+lib/libOgrePlatform.a
 lib/libOgrePlatform.la
 lib/libOgrePlatform.so
 libdata/pkgconfig/CEGUI-OGRE.pc
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index b8c7b173fa05..5fa6f4391195 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	zzip.10:${PORTSDIR}/devel/zziplib \
 		CEGUIBase.0:${PORTSDIR}/graphics/cegui
 
 WRKSRC=		${WRKDIR}/ogrenew
-CONFIGURE_ARGS=	--disable-cg --program-transform-name=
-USE_REINPLACE=	YES
+CONFIGURE_ARGS=	--disable-cg --program-transform-name= --enable-static
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
@@ -38,22 +37,6 @@ post-patch:
 		s|-lGL -lGLU|-L${X11BASE}/lib &|g; \
 		s|GLSUPPORT_CFLAGS=\$$SDL_CFLAGS|GLSUPPORT_CFLAGS="-I${X11BASE}/include \$$SDL_CFLAGS"|' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '\
-		s|\(-L$$(top_builddir)/OgreMain/src\)\([$$ ]*\)|\1/.libs\2|; \
-		s|\$$(INSTALL_PROGRAM) .libs/|\$$(INSTALL_PROGRAM) |' \
-		${WRKSRC}/Samples/*/src/Makefile.in \
-		${WRKSRC}/Tools/*/src/Makefile.in
-	@${REINPLACE_CMD} -e '\
-		s|\(-L$$(top_builddir)/OgreMain/src\)\([$$ ]*\)|\1/.libs\2|' \
-		${WRKSRC}/PlatformManagers/SDL/src/Makefile.in \
-		${WRKSRC}/PlugIns/BSPSceneManager/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|-L$$(top_builddir)/Samples/Common/CEGUIRenderer/src|&/.libs|' \
-		${WRKSRC}/Samples/Gui/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|<CEGUI/|<|g' \
 		${WRKSRC}/Samples/Gui/src/Gui.cpp \
 		${WRKSRC}/Samples/Common/CEGUIRenderer/include/OgreCEGUIResourceProvider.h \
@@ -62,6 +45,12 @@ post-patch:
 		${WRKSRC}/Samples/Common/CEGUIRenderer/src/OgreCEGUIRenderer.cpp \
 		${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/OctreeSceneManager/src/Makefile.in \
+		${WRKSRC}/RenderSystems/GL/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/Samples/Terrain/src/Makefile.in
 	@${REINPLACE_CMD} -e '\
diff --git a/graphics/ogre3d/pkg-plist b/graphics/ogre3d/pkg-plist
index 3a1701bb71f8..523f0696c603 100644
--- a/graphics/ogre3d/pkg-plist
+++ b/graphics/ogre3d/pkg-plist
@@ -196,12 +196,16 @@ include/OGRE/OgreViewport.h
 include/OGRE/OgreWireBoundingBox.h
 include/OGRE/OgreZip.h
 include/OGRE/asm_math.h
+lib/OGRE/Plugin_BSPSceneManager.a
 lib/OGRE/Plugin_BSPSceneManager.la
 lib/OGRE/Plugin_BSPSceneManager.so
+lib/OGRE/Plugin_OctreeSceneManager.a
 lib/OGRE/Plugin_OctreeSceneManager.la
 lib/OGRE/Plugin_OctreeSceneManager.so
+lib/OGRE/Plugin_ParticleFX.a
 lib/OGRE/Plugin_ParticleFX.la
 lib/OGRE/Plugin_ParticleFX.so
+lib/OGRE/RenderSystem_GL.a
 lib/OGRE/RenderSystem_GL.la
 lib/OGRE/RenderSystem_GL.so
 lib/libCEGUIOgreRenderer.a
@@ -212,6 +216,7 @@ lib/libOgreMain.a
 lib/libOgreMain.la
 lib/libOgreMain.so
 lib/libOgreMain.so.9
+lib/libOgrePlatform.a
 lib/libOgrePlatform.la
 lib/libOgrePlatform.so
 libdata/pkgconfig/CEGUI-OGRE.pc
diff --git a/graphics/ogre3d12/Makefile b/graphics/ogre3d12/Makefile
index b8c7b173fa05..5fa6f4391195 100644
--- a/graphics/ogre3d12/Makefile
+++ b/graphics/ogre3d12/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	zzip.10:${PORTSDIR}/devel/zziplib \
 		CEGUIBase.0:${PORTSDIR}/graphics/cegui
 
 WRKSRC=		${WRKDIR}/ogrenew
-CONFIGURE_ARGS=	--disable-cg --program-transform-name=
-USE_REINPLACE=	YES
+CONFIGURE_ARGS=	--disable-cg --program-transform-name= --enable-static
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
@@ -38,22 +37,6 @@ post-patch:
 		s|-lGL -lGLU|-L${X11BASE}/lib &|g; \
 		s|GLSUPPORT_CFLAGS=\$$SDL_CFLAGS|GLSUPPORT_CFLAGS="-I${X11BASE}/include \$$SDL_CFLAGS"|' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '\
-		s|\(-L$$(top_builddir)/OgreMain/src\)\([$$ ]*\)|\1/.libs\2|; \
-		s|\$$(INSTALL_PROGRAM) .libs/|\$$(INSTALL_PROGRAM) |' \
-		${WRKSRC}/Samples/*/src/Makefile.in \
-		${WRKSRC}/Tools/*/src/Makefile.in
-	@${REINPLACE_CMD} -e '\
-		s|\(-L$$(top_builddir)/OgreMain/src\)\([$$ ]*\)|\1/.libs\2|' \
-		${WRKSRC}/PlatformManagers/SDL/src/Makefile.in \
-		${WRKSRC}/PlugIns/BSPSceneManager/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|-L$$(top_builddir)/Samples/Common/CEGUIRenderer/src|&/.libs|' \
-		${WRKSRC}/Samples/Gui/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|<CEGUI/|<|g' \
 		${WRKSRC}/Samples/Gui/src/Gui.cpp \
 		${WRKSRC}/Samples/Common/CEGUIRenderer/include/OgreCEGUIResourceProvider.h \
@@ -62,6 +45,12 @@ post-patch:
 		${WRKSRC}/Samples/Common/CEGUIRenderer/src/OgreCEGUIRenderer.cpp \
 		${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/OctreeSceneManager/src/Makefile.in \
+		${WRKSRC}/RenderSystems/GL/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/Samples/Terrain/src/Makefile.in
 	@${REINPLACE_CMD} -e '\
diff --git a/graphics/ogre3d12/pkg-plist b/graphics/ogre3d12/pkg-plist
index 3a1701bb71f8..523f0696c603 100644
--- a/graphics/ogre3d12/pkg-plist
+++ b/graphics/ogre3d12/pkg-plist
@@ -196,12 +196,16 @@ include/OGRE/OgreViewport.h
 include/OGRE/OgreWireBoundingBox.h
 include/OGRE/OgreZip.h
 include/OGRE/asm_math.h
+lib/OGRE/Plugin_BSPSceneManager.a
 lib/OGRE/Plugin_BSPSceneManager.la
 lib/OGRE/Plugin_BSPSceneManager.so
+lib/OGRE/Plugin_OctreeSceneManager.a
 lib/OGRE/Plugin_OctreeSceneManager.la
 lib/OGRE/Plugin_OctreeSceneManager.so
+lib/OGRE/Plugin_ParticleFX.a
 lib/OGRE/Plugin_ParticleFX.la
 lib/OGRE/Plugin_ParticleFX.so
+lib/OGRE/RenderSystem_GL.a
 lib/OGRE/RenderSystem_GL.la
 lib/OGRE/RenderSystem_GL.so
 lib/libCEGUIOgreRenderer.a
@@ -212,6 +216,7 @@ lib/libOgreMain.a
 lib/libOgreMain.la
 lib/libOgreMain.so
 lib/libOgreMain.so.9
+lib/libOgrePlatform.a
 lib/libOgrePlatform.la
 lib/libOgrePlatform.so
 libdata/pkgconfig/CEGUI-OGRE.pc