summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2012-02-16 19:53:53 +0000
committerhans <hans@pkgsrc.org>2012-02-16 19:53:53 +0000
commit147b70ca2c25d1435944c97ed39ad043a752243e (patch)
tree7938d65e9aa24bb596ee9c85ff4281897d2d4400 /textproc
parentbd23a9db5b77e01233b2392763f60ac808d0c673 (diff)
downloadpkgsrc-147b70ca2c25d1435944c97ed39ad043a752243e.tar.gz
Don't look for glib2 in the default paths to avoid finding the wrong one.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/libplist/distinfo4
-rw-r--r--textproc/libplist/patches/patch-cmake_modules_FindGLIB2.cmake10
2 files changed, 7 insertions, 7 deletions
diff --git a/textproc/libplist/distinfo b/textproc/libplist/distinfo
index 486a927ee65..738aa844114 100644
--- a/textproc/libplist/distinfo
+++ b/textproc/libplist/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2012/01/01 14:39:33 shattered Exp $
+$NetBSD: distinfo,v 1.4 2012/02/16 19:53:53 hans Exp $
SHA1 (libplist-1.4.tar.bz2) = 82e98d13cdff1a62ad1184d515d71e8898866ee4
RMD160 (libplist-1.4.tar.bz2) = a00366f0fe164d7bd5d516092e2731b3233ac075
Size (libplist-1.4.tar.bz2) = 68176 bytes
-SHA1 (patch-cmake_modules_FindGLIB2.cmake) = 7e61b972dee88d288ebdc067440889d71011e1ed
+SHA1 (patch-cmake_modules_FindGLIB2.cmake) = 9ce39d6f623c15e1d68af18e461821c95afbe7e1
SHA1 (patch-swig_plist.i) = f4a375c2b96c8eb04c5f53f4753703c0bb86088d
diff --git a/textproc/libplist/patches/patch-cmake_modules_FindGLIB2.cmake b/textproc/libplist/patches/patch-cmake_modules_FindGLIB2.cmake
index 09f83403561..a16d7852114 100644
--- a/textproc/libplist/patches/patch-cmake_modules_FindGLIB2.cmake
+++ b/textproc/libplist/patches/patch-cmake_modules_FindGLIB2.cmake
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_modules_FindGLIB2.cmake,v 1.1.1.1 2011/11/21 18:51:37 shattered Exp $
+$NetBSD: patch-cmake_modules_FindGLIB2.cmake,v 1.2 2012/02/16 19:53:54 hans Exp $
Fix glib2 detection using macros from spectrum.im.
@@ -35,7 +35,7 @@ Fix glib2 detection using macros from spectrum.im.
find_path(GLIB2_MAIN_INCLUDE_DIR glib.h
PATH_SUFFIXES glib-2.0
- PATHS ${_LibGLIB2IncDir} )
-+ PATHS ${PKG_GLIB_INCLUDE_DIRS} )
++ PATHS ${PKG_GLIB_INCLUDE_DIRS} NO_DEFAULT_PATH)
# search the glibconfig.h include dir under the same root where the library is found
-find_library(GLIB2_LIBRARIES
@@ -45,16 +45,16 @@ Fix glib2 detection using macros from spectrum.im.
-get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH)
+find_library(GLIB2_LIBRARIES
+ NAMES glib-2.0
-+ PATHS ${PKG_GLIB_LIBRARY_DIRS} )
++ PATHS ${PKG_GLIB_LIBRARY_DIRS} NO_DEFAULT_PATH)
+
+find_library(GLIB2_THREAD
+ NAMES gthread-2.0
-+ PATHS ${PKG_GLIB_LIBRARY_DIRS} )
++ PATHS ${PKG_GLIB_LIBRARY_DIRS} NO_DEFAULT_PATH)
find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
PATH_SUFFIXES glib-2.0/include
- PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH})
-+ PATHS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_LIBRARIES} ${CMAKE_SYSTEM_LIBRARY_PATH})
++ PATHS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_LIBRARIES} ${CMAKE_SYSTEM_LIBRARY_PATH} NO_DEFAULT_PATH)
+
+if(GLIB2_THREAD)
+ set(GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${GLIB2_THREAD})