Sat Jul 7 11:52:30 2012 UTC ()
Correctly detect sockaddr_in6 on NetBSD.


(markd)
diff -r1.43 -r1.44 pkgsrc/x11/kdelibs4/Makefile
diff -r1.30 -r1.31 pkgsrc/x11/kdelibs4/distinfo
diff -r0 -r1.1 pkgsrc/x11/kdelibs4/patches/patch-kdecore_network_ConfigureChecks.cmake
cvs diff -r1.43 -r1.44 pkgsrc/x11/kdelibs4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/Makefile 2012/06/16 04:45:39 1.43
+++ pkgsrc/x11/kdelibs4/Makefile 2012/07/07 11:52:29 1.44
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.43 2012/06/16 04:45:39 markd Exp $ 1# $NetBSD: Makefile,v 1.44 2012/07/07 11:52:29 markd Exp $
2 2
3DISTNAME= kdelibs-${_KDE_VERSION} 3DISTNAME= kdelibs-${_KDE_VERSION}
4PKGNAME= ${DISTNAME:S/-4/4-4/} 4PKGNAME= ${DISTNAME:S/-4/4-4/}
 5PKGREVISION= 1
5CATEGORIES= x11 6CATEGORIES= x11
6COMMENT= Support libraries for the KDE integrated X11 desktop 7COMMENT= Support libraries for the KDE integrated X11 desktop
7 8
8#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \ 9#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \
9# http://mirrors.isc.org/pub/kde/security_patches/ 10# http://mirrors.isc.org/pub/kde/security_patches/
10#PATCHFILES= post-kde-4.0.3-khtml.diff 11#PATCHFILES= post-kde-4.0.3-khtml.diff
11 12
12.include "../../meta-pkgs/kde4/Makefile.kde4" 13.include "../../meta-pkgs/kde4/Makefile.kde4"
13 14
14CONFLICTS= kdelibs-[0-9]* 15CONFLICTS= kdelibs-[0-9]*
15 16
16# BUILD_MAKE_FLAGS+= VERBOSE=1 17# BUILD_MAKE_FLAGS+= VERBOSE=1
17 18
cvs diff -r1.30 -r1.31 pkgsrc/x11/kdelibs4/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/distinfo 2012/07/05 18:48:33 1.30
+++ pkgsrc/x11/kdelibs4/distinfo 2012/07/07 11:52:29 1.31
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: distinfo,v 1.30 2012/07/05 18:48:33 joerg Exp $ 1$NetBSD: distinfo,v 1.31 2012/07/07 11:52:29 markd Exp $
2 2
3SHA1 (kdelibs-4.8.4.tar.xz) = 35cd199a30d84eb37b2b213fed5ee3adf810ea49 3SHA1 (kdelibs-4.8.4.tar.xz) = 35cd199a30d84eb37b2b213fed5ee3adf810ea49
4RMD160 (kdelibs-4.8.4.tar.xz) = dba94c16eb0df9d6a4fccefc8097f39f4b63e9ec 4RMD160 (kdelibs-4.8.4.tar.xz) = dba94c16eb0df9d6a4fccefc8097f39f4b63e9ec
5Size (kdelibs-4.8.4.tar.xz) = 12182912 bytes 5Size (kdelibs-4.8.4.tar.xz) = 12182912 bytes
6SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4 6SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
7SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d 7SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
8SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae 8SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
9SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505 9SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505
10SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976 10SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976
11SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd 11SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd
12SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f 12SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f
13SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5 13SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5
14SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6 14SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
15SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f 15SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
16SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5 16SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
17SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4 17SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
18SHA1 (patch-kdecore_CMakeLists.txt) = 1b517aa2d8c39988251c95bcd1daa012ea9bcfaa 18SHA1 (patch-kdecore_CMakeLists.txt) = 1b517aa2d8c39988251c95bcd1daa012ea9bcfaa
19SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688 19SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
 20SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
20SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805 21SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
21SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a 22SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
22SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8 23SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8
23SHA1 (patch-nepomuk_core_nepomukmainmodel.cpp) = bba701025aa1d33b9d6ce4b6d1fec2a92b4f5552 24SHA1 (patch-nepomuk_core_nepomukmainmodel.cpp) = bba701025aa1d33b9d6ce4b6d1fec2a92b4f5552
24SHA1 (patch-nepomuk_core_resourcemanager.cpp) = 99a1e6c319f4798e5c929e77bd6717ffb2e3f571 25SHA1 (patch-nepomuk_core_resourcemanager.cpp) = 99a1e6c319f4798e5c929e77bd6717ffb2e3f571
File Added: pkgsrc/x11/kdelibs4/patches/patch-kdecore_network_ConfigureChecks.cmake
$NetBSD: patch-kdecore_network_ConfigureChecks.cmake,v 1.1 2012/07/07 11:52:29 markd Exp $

Need netinet/in.h to successfully test for sockaddr_in6 on NetBSD

--- kdecore/network/ConfigureChecks.cmake.orig	2012-06-06 20:49:52.325046002 +0000
+++ kdecore/network/ConfigureChecks.cmake
@@ -57,6 +57,6 @@ check_prototype_exists(gai_strerror netd
 # check for existing datatypes
 set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h;netdb.h")
 check_type_size("struct addrinfo" HAVE_STRUCT_ADDRINFO)
-set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h;netdb.h")
+set(CMAKE_EXTRA_INCLUDE_FILES "netinet/in.h;sys/socket.h;netdb.h")
 check_type_size("struct sockaddr_in6" HAVE_STRUCT_SOCKADDR_IN6)
 set(CMAKE_EXTRA_INCLUDE_FILES)  #reset CMAKE_EXTRA_INCLUDE_FILES