[pkgsrc/trunk]: pkgsrc/x11/kdelibs4 Be more aggressive in the removal of -ans...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1000313ab2d5
branches:  trunk
changeset: 626519:1000313ab2d5
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Nov 13 22:52:23 2013 +0000

description:
Be more aggressive in the removal of -ansi. Bump revision.

diffstat:

 x11/kdelibs4/Makefile                                           |   3 +-
 x11/kdelibs4/distinfo                                           |   4 +-
 x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake |  23 ++++++---
 3 files changed, 18 insertions(+), 12 deletions(-)

diffs (68 lines):

diff -r 13f477711291 -r 1000313ab2d5 x11/kdelibs4/Makefile
--- a/x11/kdelibs4/Makefile     Wed Nov 13 22:51:37 2013 +0000
+++ b/x11/kdelibs4/Makefile     Wed Nov 13 22:52:23 2013 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2013/11/07 13:35:56 markd Exp $
+# $NetBSD: Makefile,v 1.63 2013/11/13 22:52:23 joerg Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
 PKGNAME=       ${DISTNAME:S/-4/4-4/}
+PKGREVISION=   1
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
diff -r 13f477711291 -r 1000313ab2d5 x11/kdelibs4/distinfo
--- a/x11/kdelibs4/distinfo     Wed Nov 13 22:51:37 2013 +0000
+++ b/x11/kdelibs4/distinfo     Wed Nov 13 22:52:23 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2013/11/07 13:35:56 markd Exp $
+$NetBSD: distinfo,v 1.38 2013/11/13 22:52:23 joerg Exp $
 
 SHA1 (kdelibs-4.11.3.tar.xz) = 42bda7ca352b3f700af91262636380aa71d07519
 RMD160 (kdelibs-4.11.3.tar.xz) = 68d0b9fcb8f603015c65f39e150c64bcb2bfbff7
@@ -14,7 +14,7 @@
 SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
 SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
 SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
-SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = 4b1e7a68fe6f3766deca6d557e80ceafb37a3ee3
+SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = c1afb500a065939d95ded160ba3a336fb1ad1d7c
 SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
 SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
 SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
diff -r 13f477711291 -r 1000313ab2d5 x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake
--- a/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake   Wed Nov 13 22:51:37 2013 +0000
+++ b/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake   Wed Nov 13 22:52:23 2013 +0000
@@ -1,19 +1,24 @@
-$NetBSD: patch-cmake_modules_FindKDE4Internal.cmake,v 1.1 2013/04/03 10:51:44 markd Exp $
+$NetBSD: patch-cmake_modules_FindKDE4Internal.cmake,v 1.2 2013/11/13 22:52:23 joerg Exp $
 
-Dont pass -std=iso9899:1990 on NetBSD. Breaks ksysguardd at least.
+Don't force -std=iso9899:1990.
 
---- cmake/modules/FindKDE4Internal.cmake.orig  2013-03-01 06:26:13.000000000 +0000
+--- cmake/modules/FindKDE4Internal.cmake.orig  2013-11-01 15:45:56.000000000 +0000
 +++ cmake/modules/FindKDE4Internal.cmake
-@@ -1204,7 +1204,11 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1204,7 +1204,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
     set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
  
 -   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings 
-Wformat-security -Wmissing-format-attribute -fno-common")
-+   if (CMAKE_SYSTEM_NAME MATCHES NetBSD)
-+     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security 
-Wmissing-format-attribute -fno-common")
-+   else (CMAKE_SYSTEM_NAME MATCHES NetBSD)
-+     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings 
-Wformat-security -Wmissing-format-attribute -fno-common")
-+   endif (CMAKE_SYSTEM_NAME MATCHES NetBSD)
++   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security 
-Wmissing-format-attribute -fno-common")
     # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS 
-fno-check-new -fno-common")
  
+@@ -1336,7 +1336,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clan
+    set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+    set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+ 
+-   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings 
-Wformat-security -Wmissing-format-attribute -fno-common")
++   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security 
-Wmissing-format-attribute -fno-common")
+    # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -Woverloaded-virtual -fno-exceptions 
-DQT_NO_EXCEPTIONS -fno-common -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden")
+    set(KDE4_C_FLAGS    "-fvisibility=hidden")