[pkgsrc/trunk]: pkgsrc/x11/kdelibs4 Detect the version of recent xine's that ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/39415d612fab
branches:  trunk
changeset: 601669:39415d612fab
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Mar 22 22:08:29 2012 +0000

description:
Detect the version of recent xine's that have moved the version number
macros to xine/version.h

diffstat:

 x11/kdelibs4/Makefile                                   |   3 +-
 x11/kdelibs4/distinfo                                   |   3 +-
 x11/kdelibs4/patches/patch-cmake_modules_FindXine.cmake |  25 +++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diffs (58 lines):

diff -r 3957e6c733a5 -r 39415d612fab x11/kdelibs4/Makefile
--- a/x11/kdelibs4/Makefile     Thu Mar 22 21:44:05 2012 +0000
+++ b/x11/kdelibs4/Makefile     Thu Mar 22 22:08:29 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2012/03/19 11:28:48 markd Exp $
+# $NetBSD: Makefile,v 1.38 2012/03/22 22:08:29 markd 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 3957e6c733a5 -r 39415d612fab x11/kdelibs4/distinfo
--- a/x11/kdelibs4/distinfo     Thu Mar 22 21:44:05 2012 +0000
+++ b/x11/kdelibs4/distinfo     Thu Mar 22 22:08:29 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2012/03/19 11:28:48 markd Exp $
+$NetBSD: distinfo,v 1.25 2012/03/22 22:08:29 markd Exp $
 
 SHA1 (kdelibs-4.8.0.tar.bz2) = 5e4744405734e6c3ce572ef7d16054390692b38a
 RMD160 (kdelibs-4.8.0.tar.bz2) = b5fd03eec81a390ea74d4713d6459b685352d362
@@ -14,5 +14,6 @@
 SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
 SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
 SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
+SHA1 (patch-cmake_modules_FindXine.cmake) = 292d8e4b44367b66e3a737d2be045c2ff075e8cb
 SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
diff -r 3957e6c733a5 -r 39415d612fab x11/kdelibs4/patches/patch-cmake_modules_FindXine.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdelibs4/patches/patch-cmake_modules_FindXine.cmake   Thu Mar 22 22:08:29 2012 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-cmake_modules_FindXine.cmake,v 1.1 2012/03/22 22:08:30 markd Exp $
+
+Starting with the recently released version 1.2.0, xine has its version
+number macros in xine/version.h instead of xine.h itself.
+
+Account for this case by checking if xine/version.h exists and falling
+back to xine.h if it doesn't when reading the version numbers.
+
+--- cmake/modules/FindXine.cmake.orig  2012-01-18 18:06:22.000000000 +0000
++++ cmake/modules/FindXine.cmake
+@@ -47,7 +47,13 @@ FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES
+ 
+ # Get the version number from xine.h and store it in the cache:
+ IF(XINE_INCLUDE_DIR  AND NOT  XINE_VERSION)
+-  FILE(READ ${XINE_INCLUDE_DIR}/xine.h XINE_VERSION_CONTENT)
++  IF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) # xine 1.2.0+
++    SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine/version.h)
++  ELSE(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h)
++    SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine.h)
++  ENDIF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h)
++
++  FILE(READ ${XINE_VERSION_FILE} XINE_VERSION_CONTENT)
+   STRING(REGEX MATCH "#define *XINE_MAJOR_VERSION *([0-9]+)"  _dummy "${XINE_VERSION_CONTENT}")
+   SET(XINE_VERSION_MAJOR "${CMAKE_MATCH_1}")
+