diff options
| author | dholland <dholland@pkgsrc.org> | 2011-11-20 01:16:23 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2011-11-20 01:16:23 +0000 |
| commit | 4d06daf4dc2100d53f3cf3a18264231c5c9585d9 (patch) | |
| tree | c8a590d895365e147f2491d04de9c882b28c35a5 /graphics | |
| parent | 0f99716a5e55af1ae7ec75dac4e1502cb892c1f6 (diff) | |
| download | pkgsrc-4d06daf4dc2100d53f3cf3a18264231c5c9585d9.tar.gz | |
Apply the proper buildlink prefix for gtk2 instead of hardwiring /usr/pkg.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/darktable/Makefile | 8 | ||||
| -rw-r--r-- | graphics/darktable/distinfo | 4 | ||||
| -rw-r--r-- | graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake | 15 |
3 files changed, 19 insertions, 8 deletions
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index c436bca3a31..e570f873578 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2011/11/15 21:19:02 jakllsch Exp $ +# $NetBSD: Makefile,v 1.6 2011/11/20 01:16:23 dholland Exp $ DISTNAME= darktable-0.9.3 CATEGORIES= graphics @@ -25,6 +25,12 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=Yes CMAKE_ARGS+= -Wno-dev +SUBST_CLASSES+= gtkpath +SUBST_FILES.gtkpath= cmake/modules/FindGTK2.cmake +SUBST_SED.gtkpath= -e 's|@PREFIX@|${BUILDLINK_PREFIX.gtk2}|' +SUBST_STAGE.gtkpath= pre-configure +SUBST_MESSAGE.gtkpath= Setting path to gtk2. + CONFIGURE_DIRS= pkgsrc_build CMAKE_ARG_PATH= .. LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/darktable diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo index 06198c9d2c2..b66ccc267e4 100644 --- a/graphics/darktable/distinfo +++ b/graphics/darktable/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2011/11/17 09:00:54 obache Exp $ +$NetBSD: distinfo,v 1.6 2011/11/20 01:16:23 dholland Exp $ SHA1 (darktable-0.9.3.tar.gz) = 36ed6c1102b920096cf80affd71adfa66ae85381 RMD160 (darktable-0.9.3.tar.gz) = a7c51262a52fae0b33179fb4d9030eb78444305d Size (darktable-0.9.3.tar.gz) = 2330605 bytes -SHA1 (patch-cmake_modules_FindGTK2.cmake) = 30dae502bad02a7b993f201a727eba7efa43ed4e +SHA1 (patch-cmake_modules_FindGTK2.cmake) = de1273594801ab82da31b624845e0b36a77b53b3 SHA1 (patch-data_darktable-faster) = 2eed0fcf4cf571aaf2a19f5dee6b19a2668cf1e1 SHA1 (patch-doc_CMakeLists.txt) = 7b7af1dda752725d5b42ba4395de1cd5390c64fd SHA1 (patch-src_CMakeLists.txt) = a91701a345376ba140167229b475d11c7c2e7b13 diff --git a/graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake b/graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake index c77ffdde73f..5de479cde64 100644 --- a/graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake +++ b/graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake @@ -1,6 +1,11 @@ -$NetBSD: patch-cmake_modules_FindGTK2.cmake,v 1.2 2011/08/25 14:42:53 jakllsch Exp $ +$NetBSD: patch-cmake_modules_FindGTK2.cmake,v 1.3 2011/11/20 01:16:23 dholland Exp $ -Look for GTK where we might find it. Should honor ${PREFIX} someday. +Look for GTK in the right place. + +Caution: this patch inserts a substitution of PREFIX that is expanded +from the pkgsrc makefile at pre-configure time. If regenerating this +patch, make sure to do it in a tree that hasn't been configured or +built to avoid permanently expanding the substitution. --- cmake/modules/FindGTK2.cmake.orig 2011-08-24 09:20:29.000000000 +0000 +++ cmake/modules/FindGTK2.cmake @@ -8,9 +13,9 @@ Look for GTK where we might find it. Should honor ${PREFIX} someday. /usr/openwin/lib /sw/include /sw/lib -+ /usr/pkg/include/glib -+ /usr/pkg/include -+ /usr/pkg/lib ++ @PREFIX@/include/glib ++ @PREFIX@/include ++ @PREFIX@/lib $ENV{GTKMM_BASEPATH}/include $ENV{GTKMM_BASEPATH}/lib [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include |