Simplify some patches

5 files changed, 19 insertions, 32 deletions

diff --git a/devel/generatorrunner/files/patch-CMakeLists.txt b/devel/generatorrunner/files/patch-CMakeLists.txt
index adff1a26821d..e9da8bab1227 100644
--- a/devel/generatorrunner/files/patch-CMakeLists.txt
+++ b/devel/generatorrunner/files/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
---- ./CMakeLists.txt.orig	2011-11-18 21:38:22.000000000 +0100
-+++ ./CMakeLists.txt	2011-12-18 18:34:11.000000000 +0100
+--- CMakeLists.txt.orig	2011-12-30 18:21:10 UTC
++++ CMakeLists.txt
 @@ -41,7 +41,7 @@
  set(generator_MINOR_VERSION "6")
- set(generator_MICRO_VERSION "15")
+ set(generator_MICRO_VERSION "16")
  set(generator_VERSION "${generator_MAJOR_VERSION}.${generator_MINOR_VERSION}.${generator_MICRO_VERSION}")
 -set(generator_SOVERSION "${generator_MAJOR_VERSION}.${generator_MINOR_VERSION}")
 +set(generator_SOVERSION "${generator_MAJOR_VERSION}")
diff --git a/devel/generatorrunner/files/patch-data__CMakeLists.txt b/devel/generatorrunner/files/patch-data__CMakeLists.txt
index 0b2a5d52e19d..cbb9917834d6 100644
--- a/devel/generatorrunner/files/patch-data__CMakeLists.txt
+++ b/devel/generatorrunner/files/patch-data__CMakeLists.txt
@@ -1,5 +1,5 @@
---- ./data/CMakeLists.txt.orig	2011-11-18 21:38:22.000000000 +0100
-+++ ./data/CMakeLists.txt	2011-12-18 18:34:31.000000000 +0100
+--- data/CMakeLists.txt.orig	2011-12-30 18:21:10 UTC
++++ data/CMakeLists.txt
 @@ -7,7 +7,7 @@
                 "${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerConfigVersion.cmake" @ONLY)
  
@@ -9,13 +9,9 @@
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerConfig.cmake"
          DESTINATION "${LIB_INSTALL_DIR}/cmake/GeneratorRunner-${generator_VERSION}")
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerConfigVersion.cmake"
-@@ -20,6 +20,7 @@
-                                                               "${CMAKE_CURRENT_BINARY_DIR}/generatorrunner${generator_SUFFIX}.1")
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/generatorrunner.pc.in"
+@@ -22,4 +22,4 @@
                 "${CMAKE_CURRENT_BINARY_DIR}/generatorrunner${generator_SUFFIX}.pc" @ONLY)
--
-+if(NOT NO_INSTALL_MANPAGES)
+ 
  file(GLOB manpages "${CMAKE_CURRENT_BINARY_DIR}/*${generator_SUFFIX}.1")
 -install(FILES ${manpages} DESTINATION share/man/man1)
 +install(FILES ${manpages} DESTINATION man/man1)
-+endif()
diff --git a/devel/pyside-tools/files/patch-CMakeLists.txt b/devel/pyside-tools/files/patch-CMakeLists.txt
index 101d0c8648fa..a685544e6d3f 100644
--- a/devel/pyside-tools/files/patch-CMakeLists.txt
+++ b/devel/pyside-tools/files/patch-CMakeLists.txt
@@ -1,11 +1,8 @@
---- ./CMakeLists.txt.orig	2011-08-22 23:19:14.000000000 +0200
-+++ ./CMakeLists.txt	2011-12-18 15:02:59.000000000 +0100
-@@ -43,9 +43,9 @@
-         PATTERN "*pysideuic\\__init__.py" EXCLUDE)
- 
+--- CMakeLists.txt.orig	2011-08-22 21:19:14 UTC
++++ CMakeLists.txt
+@@ -45,7 +45,7 @@
  # Man pages for pyside-uic
--if (NOT win32)
-+if (NOT (win32 OR NO_INSTALL_MANPAGES))
+ if (NOT win32)
      file(GLOB manpages "${CMAKE_CURRENT_SOURCE_DIR}/pysideuic/*.1")
 -    install(FILES ${manpages} DESTINATION share/man/man1)
 +    install(FILES ${manpages} DESTINATION man/man1)
diff --git a/devel/pyside-tools/files/patch-pylupdate__CMakeLists.txt b/devel/pyside-tools/files/patch-pylupdate__CMakeLists.txt
index 75a0a4f3879a..258585516733 100644
--- a/devel/pyside-tools/files/patch-pylupdate__CMakeLists.txt
+++ b/devel/pyside-tools/files/patch-pylupdate__CMakeLists.txt
@@ -1,11 +1,8 @@
---- ./pylupdate/CMakeLists.txt.orig	2011-08-22 23:19:14.000000000 +0200
-+++ ./pylupdate/CMakeLists.txt	2011-12-18 15:03:30.000000000 +0100
-@@ -31,8 +31,8 @@
- install(TARGETS pyside-lupdate RUNTIME DESTINATION bin)
- 
+--- pylupdate/CMakeLists.txt.orig	2011-08-22 21:19:14 UTC
++++ pylupdate/CMakeLists.txt
+@@ -33,6 +33,6 @@
  # Man pages
--if (NOT win32)
-+if (NOT (win32 OR NO_INSTALL_MANPAGES))
+ if (NOT win32)
      file(GLOB manpages "${CMAKE_CURRENT_SOURCE_DIR}/*.1")
 -    install(FILES ${manpages} DESTINATION share/man/man1)
 +    install(FILES ${manpages} DESTINATION man/man1)
diff --git a/devel/pyside-tools/files/patch-pyrcc__CMakeLists.txt b/devel/pyside-tools/files/patch-pyrcc__CMakeLists.txt
index c84b86f14b81..6fca096e7363 100644
--- a/devel/pyside-tools/files/patch-pyrcc__CMakeLists.txt
+++ b/devel/pyside-tools/files/patch-pyrcc__CMakeLists.txt
@@ -1,11 +1,8 @@
---- ./pyrcc/CMakeLists.txt.orig	2011-08-22 23:19:14.000000000 +0200
-+++ ./pyrcc/CMakeLists.txt	2011-12-18 15:03:49.000000000 +0100
-@@ -13,8 +13,8 @@
- install(TARGETS pyside-rcc RUNTIME DESTINATION bin)
- 
+--- pyrcc/CMakeLists.txt.orig	2011-08-22 21:19:14 UTC
++++ pyrcc/CMakeLists.txt
+@@ -15,6 +15,6 @@
  # Man pages
--if (NOT win32)
-+if (NOT (win32 OR NO_INSTALL_MANPAGES))
+ if (NOT win32)
      file(GLOB manpages "${CMAKE_CURRENT_SOURCE_DIR}/*.1")
 -    install(FILES ${manpages} DESTINATION share/man/man1)
 +    install(FILES ${manpages} DESTINATION man/man1)