4 files changed, 69 insertions, 6 deletions

diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index a80ead40e1c4..f8a93d421286 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogre3d
 PORTVERSION=	1.7.3
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/ogre/ogre/${PORTVERSION:C/.[0-9]$//g}
 DISTNAME=	ogre_src_v${PORTVERSION:S/./-/g}
diff --git a/graphics/ogre3d/files/patch-CMakeLists.txt b/graphics/ogre3d/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..8141884bb28c
--- /dev/null
+++ b/graphics/ogre3d/files/patch-CMakeLists.txt
@@ -0,0 +1,18 @@
+--- CMakeLists.txt.orig	2011-08-21 00:25:46.000000000 +0200
++++ CMakeLists.txt	2011-08-21 00:29:36.000000000 +0200
+@@ -291,6 +291,7 @@ cmake_dependent_option(OGRE_FULL_RPATH "
+ option(OGRE_PROFILING "Enable internal profiling support." FALSE)
+ cmake_dependent_option(OGRE_CONFIG_STATIC_LINK_CRT "Statically link the MS CRT dlls (msvcrt)" FALSE "MSVC" FALSE)
+ set(OGRE_LIB_DIRECTORY "lib${LIB_SUFFIX}" CACHE STRING "Install path for libraries, e.g. 'lib64' on some 64-bit Linux distros.")
++set(OGRE_LIBDATA_DIRECTORY "libdata" CACHE STRING "Install path for data files.")
+ 
+ # hide advanced options
+ mark_as_advanced(
+@@ -314,6 +315,7 @@ mark_as_advanced(
+   OGRE_PROFILING
+   OGRE_CONFIG_STATIC_LINK_CRT
+   OGRE_LIB_DIRECTORY
++  OGRE_LIBDATA_DIRECTORY
+ )
+ 
+ ###################################################################
diff --git a/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake b/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake
new file mode 100644
index 000000000000..217dc242d2cc
--- /dev/null
+++ b/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake
@@ -0,0 +1,45 @@
+--- CMake/ConfigureBuild.cmake.orig	2011-08-21 00:23:58.000000000 +0200
++++ CMake/ConfigureBuild.cmake	2011-08-21 00:25:02.000000000 +0200
+@@ -180,18 +180,18 @@ if (UNIX)
+   else ()
+     configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY)
+   endif ()
+-  install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
++  install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
+ 
+   # configure additional packages
+   
+   if (OGRE_BUILD_PLUGIN_PCZ)
+     configure_file(${OGRE_TEMPLATES_DIR}/OGRE-PCZ.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-PCZ.pc @ONLY)
+-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-PCZ.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
++    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-PCZ.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
+   endif ()
+   
+   if (OGRE_BUILD_COMPONENT_PAGING)
+     configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Paging.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Paging.pc @ONLY)
+-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Paging.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
++    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Paging.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
+   endif ()
+ 
+   if (OGRE_BUILD_COMPONENT_TERRAIN)
+@@ -199,17 +199,17 @@ if (UNIX)
+       set(OGRE_PAGING_ADDITIONAL_PACKAGES ", OGRE-Paging = ${OGRE_VERSION}")
+     endif ()
+     configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Terrain.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc @ONLY)
+-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
++    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
+   endif ()
+ 
+   if (OGRE_BUILD_COMPONENT_RTSHADERSYSTEM)
+     configure_file(${OGRE_TEMPLATES_DIR}/OGRE-RTShaderSystem.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-RTShaderSystem.pc @ONLY)
+-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-RTShaderSystem.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
++    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-RTShaderSystem.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
+   endif ()
+ 
+   if (OGRE_BUILD_COMPONENT_PROPERTY)
+     configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Property.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Property.pc @ONLY)
+-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Property.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
++    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Property.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
+   endif ()
+ 
+ endif ()
diff --git a/graphics/ogre3d/pkg-plist b/graphics/ogre3d/pkg-plist
index bdcfb8754681..e7ecaa351ca9 100644
--- a/graphics/ogre3d/pkg-plist
+++ b/graphics/ogre3d/pkg-plist
@@ -466,11 +466,11 @@ lib/libOgreRTShaderSystem.so
 lib/libOgreRTShaderSystem.so.1.7.3
 lib/libOgreTerrain.so
 lib/libOgreTerrain.so.1.7.3
-lib/pkgconfig/OGRE-PCZ.pc
-lib/pkgconfig/OGRE-Paging.pc
-lib/pkgconfig/OGRE-RTShaderSystem.pc
-lib/pkgconfig/OGRE-Terrain.pc
-lib/pkgconfig/OGRE.pc
+libdata/pkgconfig/OGRE-PCZ.pc
+libdata/pkgconfig/OGRE-Paging.pc
+libdata/pkgconfig/OGRE-RTShaderSystem.pc
+libdata/pkgconfig/OGRE-Terrain.pc
+libdata/pkgconfig/OGRE.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -492,5 +492,4 @@ lib/pkgconfig/OGRE.pc
 @dirrm include/OGRE
 @dirrm lib/OGRE/cmake
 @dirrm lib/OGRE
-@dirrm lib/pkgconfig
 %%PORTDOCS%%@dirrm %%DOCSDIR%%