From owner-svn-ports-all@FreeBSD.ORG Tue Aug 19 16:51:27 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45DA47A6; Tue, 19 Aug 2014 16:51:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 24DA135FF; Tue, 19 Aug 2014 16:51:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7JGpR4v039181; Tue, 19 Aug 2014 16:51:27 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7JGpQ7Y039175; Tue, 19 Aug 2014 16:51:26 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201408191651.s7JGpQ7Y039175@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 19 Aug 2014 16:51:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365399 - in head/devel: generatorrunner/files pyside-tools/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2014 16:51:27 -0000 Author: antoine Date: Tue Aug 19 16:51:25 2014 New Revision: 365399 URL: http://svnweb.freebsd.org/changeset/ports/365399 QAT: https://qat.redports.org/buildarchive/r365399/ Log: Simplify some patches Modified: head/devel/generatorrunner/files/patch-CMakeLists.txt head/devel/generatorrunner/files/patch-data__CMakeLists.txt head/devel/pyside-tools/files/patch-CMakeLists.txt head/devel/pyside-tools/files/patch-pylupdate__CMakeLists.txt head/devel/pyside-tools/files/patch-pyrcc__CMakeLists.txt Modified: head/devel/generatorrunner/files/patch-CMakeLists.txt ============================================================================== --- head/devel/generatorrunner/files/patch-CMakeLists.txt Tue Aug 19 16:51:15 2014 (r365398) +++ head/devel/generatorrunner/files/patch-CMakeLists.txt Tue Aug 19 16:51:25 2014 (r365399) @@ -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}") Modified: head/devel/generatorrunner/files/patch-data__CMakeLists.txt ============================================================================== --- head/devel/generatorrunner/files/patch-data__CMakeLists.txt Tue Aug 19 16:51:15 2014 (r365398) +++ head/devel/generatorrunner/files/patch-data__CMakeLists.txt Tue Aug 19 16:51:25 2014 (r365399) @@ -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() Modified: head/devel/pyside-tools/files/patch-CMakeLists.txt ============================================================================== --- head/devel/pyside-tools/files/patch-CMakeLists.txt Tue Aug 19 16:51:15 2014 (r365398) +++ head/devel/pyside-tools/files/patch-CMakeLists.txt Tue Aug 19 16:51:25 2014 (r365399) @@ -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) Modified: head/devel/pyside-tools/files/patch-pylupdate__CMakeLists.txt ============================================================================== --- head/devel/pyside-tools/files/patch-pylupdate__CMakeLists.txt Tue Aug 19 16:51:15 2014 (r365398) +++ head/devel/pyside-tools/files/patch-pylupdate__CMakeLists.txt Tue Aug 19 16:51:25 2014 (r365399) @@ -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) Modified: head/devel/pyside-tools/files/patch-pyrcc__CMakeLists.txt ============================================================================== --- head/devel/pyside-tools/files/patch-pyrcc__CMakeLists.txt Tue Aug 19 16:51:15 2014 (r365398) +++ head/devel/pyside-tools/files/patch-pyrcc__CMakeLists.txt Tue Aug 19 16:51:25 2014 (r365399) @@ -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)