Thu Dec 22 21:03:39 2016 UTC ()
Deal with Jasper fallout. Still doesn't build for unrelated reasons.


(joerg)
diff -r1.126 -r1.127 pkgsrc/graphics/digikam/Makefile
cvs diff -r1.126 -r1.127 pkgsrc/graphics/digikam/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/digikam/Makefile 2016/10/07 18:25:52 1.126
+++ pkgsrc/graphics/digikam/Makefile 2016/12/22 21:03:38 1.127
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.126 2016/10/07 18:25:52 adam Exp $ 1# $NetBSD: Makefile,v 1.127 2016/12/22 21:03:38 joerg Exp $
2 2
3DISTNAME= digikam-4.13.0 3DISTNAME= digikam-4.13.0
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_KDE:=digikam/} 6MASTER_SITES= ${MASTER_SITE_KDE:=digikam/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.digikam.org/ 10HOMEPAGE= http://www.digikam.org/
11COMMENT= Advanced digital photo management application (KDE4) 11COMMENT= Advanced digital photo management application (KDE4)
12LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1 12LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1
13 13
14BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 14BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
@@ -19,26 +19,29 @@ USE_LANGUAGES= c c++ @@ -19,26 +19,29 @@ USE_LANGUAGES= c c++
19 19
20REPLACE_PERL= core/data/scripts/digitaglinktree/digitaglinktree 20REPLACE_PERL= core/data/scripts/digitaglinktree/digitaglinktree
21CMAKE_ARGS+= -DMYSQLD_PATH:PATH=${BUILDLINK_PREFIX.mysql-server}/libexec 21CMAKE_ARGS+= -DMYSQLD_PATH:PATH=${BUILDLINK_PREFIX.mysql-server}/libexec
22CMAKE_ARGS+= -DENABLE_OPENCV3:BOOL=ON 22CMAKE_ARGS+= -DENABLE_OPENCV3:BOOL=ON
23USE_TOOLS+= gawk msgfmt perl:run pkg-config 23USE_TOOLS+= gawk msgfmt perl:run pkg-config
24 24
25CXXFLAGS.NetBSD+= -D_KERNTYPES 25CXXFLAGS.NetBSD+= -D_KERNTYPES
26 26
27.include "options.mk" 27.include "options.mk"
28 28
29post-patch: 29post-patch:
30 rm ${WRKSRC}/po/*/kipiplug* ${WRKSRC}/po/*/libkipi* 30 rm ${WRKSRC}/po/*/kipiplug* ${WRKSRC}/po/*/libkipi*
31 31
 32# jasper uses SIZE_MAX and friends in its headers.
 33CXXFLAGS+= -D__STDC_LIMIT_MACROS
 34
32.include "../../meta-pkgs/kde4/kde4.mk" 35.include "../../meta-pkgs/kde4/kde4.mk"
33.include "../../databases/mysql55-server/buildlink3.mk" 36.include "../../databases/mysql55-server/buildlink3.mk"
34.include "../../devel/libgphoto2/buildlink3.mk" 37.include "../../devel/libgphoto2/buildlink3.mk"
35.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 38.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
36.include "../../graphics/lcms/buildlink3.mk" 39.include "../../graphics/lcms/buildlink3.mk"
37.include "../../graphics/libkdcraw/buildlink3.mk" 40.include "../../graphics/libkdcraw/buildlink3.mk"
38.include "../../graphics/libkexiv2/buildlink3.mk" 41.include "../../graphics/libkexiv2/buildlink3.mk"
39.include "../../graphics/libkipi/buildlink3.mk" 42.include "../../graphics/libkipi/buildlink3.mk"
40.include "../../graphics/libksane/buildlink3.mk" 43.include "../../graphics/libksane/buildlink3.mk"
41.include "../../graphics/libkface/buildlink3.mk" 44.include "../../graphics/libkface/buildlink3.mk"
42.include "../../graphics/libpgf/buildlink3.mk" 45.include "../../graphics/libpgf/buildlink3.mk"
43.include "../../graphics/liblqr/buildlink3.mk" 46.include "../../graphics/liblqr/buildlink3.mk"
44.include "../../graphics/tiff/buildlink3.mk" 47.include "../../graphics/tiff/buildlink3.mk"