diff options
| author | markd <markd@pkgsrc.org> | 2013-04-28 02:03:37 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2013-04-28 02:03:37 +0000 |
| commit | 0abb9105f4da8b0254a307ed0737c64a7c31cf14 (patch) | |
| tree | ee0fab62a121cf773e47dd794c0e0a1f76447366 /graphics | |
| parent | 0dbe82cf6fb200b861656694f38c3ef179201a00 (diff) | |
| download | pkgsrc-0abb9105f4da8b0254a307ed0737c64a7c31cf14.tar.gz | |
Make options optional.
switch lensfun option off by default as seems to cause segfaults.
remove nonexistant marble option.
Set build type to Debug to assist tracking down segfaults.
Bump PKGREVISION.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/digikam/Makefile | 4 | ||||
| -rw-r--r-- | graphics/digikam/options.mk | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 338d76a934f..f14ce0610af 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.93 2013/04/03 12:52:04 markd Exp $ +# $NetBSD: Makefile,v 1.94 2013/04/28 02:03:37 markd Exp $ # DISTNAME= digikam-3.1.0 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_KDE:=digikam/} EXTRACT_SUFX= .tar.bz2 @@ -21,6 +22,7 @@ REPLACE_PERL= core/utilities/scripts/digitaglinktree/digitaglinktree CMAKE_ARGS+= -DMYSQLD_PATH:PATH=${BUILDLINK_PREFIX.mysql-server}/libexec CMAKE_ARGS+= -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS:BOOL=OFF USE_TOOLS+= gawk msgfmt perl:run pkg-config +CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug .include "options.mk" diff --git a/graphics/digikam/options.mk b/graphics/digikam/options.mk index 7cc95b897da..7bc712dc65c 100644 --- a/graphics/digikam/options.mk +++ b/graphics/digikam/options.mk @@ -1,23 +1,25 @@ -# $NetBSD: options.mk,v 1.2 2012/03/21 21:14:47 markd Exp $ +# $NetBSD: options.mk,v 1.3 2013/04/28 02:03:38 markd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.digikam -PKG_SUPPORTED_OPTIONS= lensfun liblqr marble pim -PKG_SUGGESTED_OPTIONS= lensfun liblqr marble pim +PKG_SUPPORTED_OPTIONS= lensfun liblqr pim +PKG_SUGGESTED_OPTIONS= lensfun liblqr pim .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mlensfun) .include "../../graphics/lensfun/buildlink3.mk" +.else +CMAKE_ARGS+= -DWITH_LensFun:BOOL=OFF .endif .if !empty(PKG_OPTIONS:Mliblqr) .include "../../graphics/liblqr/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mmarble) -.include "../../misc/marble/buildlink3.mk" +.else +CMAKE_ARGS+= -DWITH_Lqr-1:BOOL=OFF .endif .if !empty(PKG_OPTIONS:Mpim) .include "../../misc/kdepimlibs4/buildlink3.mk" +.else +CMAKE_ARGS+= -DWITH_KdepimLibs:BOOL=OFF .endif |