diff options
author | wiz <wiz@pkgsrc.org> | 2013-09-10 11:23:20 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2013-09-10 11:23:20 +0000 |
commit | fdcf5ab6f3f07079d667e4bdb4a4fdbe14fefcf6 (patch) | |
tree | 3e3083aac6ea76b1a0d18b2f70f8306706e7f26e /graphics | |
parent | 168ee0b1e006d0e71e2c856c962260cad932cbc1 (diff) | |
download | pkgsrc-fdcf5ab6f3f07079d667e4bdb4a4fdbe14fefcf6.tar.gz |
Switch from mysql51 to mysql55 (current pkgsrc default).
Do not build a debug build by default; add a default-off option for that
instead.
Bump PKGREVISION.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/digikam/Makefile | 8 | ||||
-rw-r--r-- | graphics/digikam/options.mk | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index d94bf5e4ac3..dc00bc4eae5 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.103 2013/07/05 13:29:34 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.104 2013/09/10 11:23:20 wiz Exp $ DISTNAME= digikam-3.2.0 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_KDE:=digikam/} EXTRACT_SUFX= .tar.bz2 @@ -22,7 +21,6 @@ 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" @@ -30,7 +28,7 @@ post-patch: rm ${WRKSRC}/po/*/libkgeomap.po ${WRKSRC}/po/*/kipiplug* ${WRKSRC}/po/*/libkipi* .include "../../meta-pkgs/kde4/kde4.mk" -.include "../../databases/mysql51-server/buildlink3.mk" +.include "../../databases/mysql55-server/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libkdcraw/buildlink3.mk" diff --git a/graphics/digikam/options.mk b/graphics/digikam/options.mk index 2053387450e..4850e4139ca 100644 --- a/graphics/digikam/options.mk +++ b/graphics/digikam/options.mk @@ -1,11 +1,15 @@ -# $NetBSD: options.mk,v 1.4 2013/05/21 13:04:09 markd Exp $ +# $NetBSD: options.mk,v 1.5 2013/09/10 11:23:20 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.digikam -PKG_SUPPORTED_OPTIONS= lensfun liblqr pim +PKG_SUPPORTED_OPTIONS= debug lensfun liblqr pim PKG_SUGGESTED_OPTIONS= liblqr pim .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Mdebug) +CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug +.endif + .if !empty(PKG_OPTIONS:Mlensfun) .include "../../graphics/lensfun/buildlink3.mk" .else |