1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00

Simplify some patches

This commit is contained in:
Antoine Brodin 2014-08-19 16:51:25 +00:00
parent b6b8536f10
commit ac402f2fa6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=365399
5 changed files with 19 additions and 32 deletions

View File

@ -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}")

View File

@ -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()

View File

@ -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)

View File

@ -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)

View File

@ -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)