update darktable to 1.1

upstream release notes:

general

    new camera support, new whitebalance presets, etc., including
    canon eos m support and samsung nx fix
    similarity matching search for images that look alike.
    geotagging, complete with map view (thanks to dinamic for starting that ages ago and to houz for actually bringing it home):
    http://www.darktable.org/2012/09/geotagging-in-darktable/
    mac os package: http://www.darktable.org/2012/08/bringing-current-darktable-to-os-x/
    a lot of bugfixes (mainly thanks to ulrich for his meticulous work)
    facebook exporter (for those who have an account there)

ui

    reworked the much hated `more plugins' widget (thanks to boucman)
    image grouping: http://www.darktable.org/2012/09/grouping/
    command line interface! http://www.darktable.org/2012/07/exporting-images-on-the-command-line/
    tone and base curves got a new user interface to better support fine grained workflow as in: http://www.darktable.org/2012/02/mastering-color-with-lab-tone-curves/
    visually low-profile controls with finetuning: http://www.darktable.org/2012/03/bauhaus-widgets/
    color correction module (http://www.darktable.org/2012/03/color-correction/) got a GUI update since the blog post (two circles indicating shadows and highlights instead of the quad).
    live view for tethered shooting! http://www.darktable.org/2012/05/live-view/

darkroom

    extensive use of edge-aware filtering techniques to suppress noise, halos and ringing all around darktable: http://www.darktable.org/2012/09/edge-aware-image-development/
    conditional blending, and a lot of goodies around it! http://www.darktable.org/2012/07/some-enhancements-to-conditional-blending/
    magenta highlights: http://www.darktable.org/2012/07/magenta-highlights/improved on high-contrast edges to overexposed areas (should get rid of purple highlights on tiny water waves and purple fringes around tree leaves for example)
    much improved sharpness for both export and darkroom view, especially for downsampled images and if you use lens corrections or rotations/perspective corrections. check the new options in the preferences dialog, also one more than mentioned in the blog ("demosaicing for zoomed out darkroom mode" to trade performance for even more sharpness): http://www.darktable.org/2012/06/upcoming-features-new-interpolation-modes-and-better-resize/

color management

    improved per-screen color management (should reload the screen profile automatically)
    more compatible embedded color profiles (should fix problems on windows viewing our images, if that matters)
    read embedded color profiles from jpg

opencl

    most of our modules now can take advantage of your computer's gpu power
    caching for compiled opencl kernels (even in case the driver doesn't do it) for faster startup times

usermanual

    find a pdf snapshot here: https://sourceforge.net/projects/darktable/files/darktable/1.1/darktable-usermanual.pdf/download
    is reasonably up to date again
    not translated so far

translations

    two new translations (both portuguese.. ;) )
    well translated: cs de es fr it ja nl pl pt_BR pt_PT sv
    half translated: ca fi gl ro ru sq th zh_CN

14 files changed, 107 insertions, 160 deletions

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 70901a2909e..b28ccbe9d6d 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2012/10/08 23:01:40 adam Exp $
+# $NetBSD: Makefile,v 1.23 2012/12/08 00:15:26 jakllsch Exp $
 
-DISTNAME=	darktable-1.0.5
-PKGREVISION=	5
+DISTNAME=	darktable-1.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=darktable/}
 
@@ -48,21 +47,20 @@ CFLAGS+=	-mstackrealign -msse2
 CFLAGS+=	-D_NETBSD_SOURCE
 .endif
 
+CHECK_PORTABILITY_SKIP+= packaging/macosx/start
+
 # for some reason msgfmt can't handle these po files
 post-extract:
-	${RM} ${WRKSRC}/po/cs.po
-	${RM} ${WRKSRC}/po/es.po
-	${RM} ${WRKSRC}/po/fr.po
-	${RM} ${WRKSRC}/po/it.po
-	${RM} ${WRKSRC}/po/ja.po
-	${RM} ${WRKSRC}/po/nl.po
 	${RM} ${WRKSRC}/po/pl.po
-	${RM} ${WRKSRC}/po/ru.po
-	${RM} ${WRKSRC}/po/sv.po
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/pkgsrc_build
 
+# wants Clearlooks at runtime
+DEPENDS+=	gtk2-engines-[0-9]*:../../x11/gtk2-engines
+
+BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.12.1
+
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
@@ -78,9 +76,11 @@ pre-configure:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../net/flickcurl/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/json-glib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/graphics/darktable/PLIST b/graphics/darktable/PLIST
index bc15682dcce..16b021dd4c6 100644
--- a/graphics/darktable/PLIST
+++ b/graphics/darktable/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2012/07/29 20:20:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/12/08 00:15:26 jakllsch Exp $
 bin/darktable
+bin/darktable-cli
 bin/darktable-cltest
 bin/darktable-viewer
 lib/darktable/libdarktable.so
@@ -12,11 +13,14 @@ lib/darktable/plugins/imageio/format/libppm.so
 lib/darktable/plugins/imageio/format/libtiff.so
 lib/darktable/plugins/imageio/storage/libdisk.so
 lib/darktable/plugins/imageio/storage/libemail.so
+lib/darktable/plugins/imageio/storage/libfacebook.so
 lib/darktable/plugins/imageio/storage/libflickr.so
 lib/darktable/plugins/imageio/storage/libgallery.so
+lib/darktable/plugins/imageio/storage/liblatex.so
 lib/darktable/plugins/imageio/storage/libpicasa.so
 lib/darktable/plugins/libatrous.so
 lib/darktable/plugins/libbasecurve.so
+lib/darktable/plugins/libbilat.so
 lib/darktable/plugins/libbilateral.so
 lib/darktable/plugins/libbloom.so
 lib/darktable/plugins/libborders.so
@@ -36,6 +40,7 @@ lib/darktable/plugins/libequalizer.so
 lib/darktable/plugins/libexposure.so
 lib/darktable/plugins/libflip.so
 lib/darktable/plugins/libgamma.so
+lib/darktable/plugins/libglobaltonemap.so
 lib/darktable/plugins/libgraduatednd.so
 lib/darktable/plugins/libgrain.so
 lib/darktable/plugins/libhighlights.so
@@ -76,6 +81,7 @@ lib/darktable/plugins/lighttable/libdarktable_label.so
 lib/darktable/plugins/lighttable/libexport.so
 lib/darktable/plugins/lighttable/libfilmstrip.so
 lib/darktable/plugins/lighttable/libfilter.so
+lib/darktable/plugins/lighttable/libgeotagging.so
 lib/darktable/plugins/lighttable/libglobal_toolbox.so
 lib/darktable/plugins/lighttable/libhinter.so
 lib/darktable/plugins/lighttable/libhistogram.so
@@ -84,6 +90,9 @@ lib/darktable/plugins/lighttable/libimage.so
 lib/darktable/plugins/lighttable/libimport.so
 lib/darktable/plugins/lighttable/libkeywords.so
 lib/darktable/plugins/lighttable/liblighttable_mode.so
+lib/darktable/plugins/lighttable/liblive_view.so
+lib/darktable/plugins/lighttable/liblocation.so
+lib/darktable/plugins/lighttable/libmap_settings.so
 lib/darktable/plugins/lighttable/libmetadata.so
 lib/darktable/plugins/lighttable/libmetadata_view.so
 lib/darktable/plugins/lighttable/libmodule_toolbox.so
@@ -93,6 +102,7 @@ lib/darktable/plugins/lighttable/libnavigation.so
 lib/darktable/plugins/lighttable/libratings.so
 lib/darktable/plugins/lighttable/librecentcollect.so
 lib/darktable/plugins/lighttable/libselect.so
+lib/darktable/plugins/lighttable/libsimilarity.so
 lib/darktable/plugins/lighttable/libsnapshots.so
 lib/darktable/plugins/lighttable/libstyles.so
 lib/darktable/plugins/lighttable/libtagging.so
@@ -101,20 +111,33 @@ lib/darktable/plugins/lighttable/libviewswitcher.so
 lib/darktable/views/libcapture.so
 lib/darktable/views/libdarkroom.so
 lib/darktable/views/liblighttable.so
+lib/darktable/views/libmap.so
 man/man1/darktable.1
 share/applications/darktable.desktop
 share/darktable/darktable.gtkrc
 share/darktable/darktablerc
 share/darktable/gdb_commands
+share/darktable/js/.DS_Store
+share/darktable/js/builder.js
+share/darktable/js/effects.js
+share/darktable/js/lightbox-web.js
+share/darktable/js/lightbox.js
+share/darktable/js/prototype.js
+share/darktable/js/scriptaculous.js
 share/darktable/kernels/atrous.cl
 share/darktable/kernels/basic.cl
+share/darktable/kernels/bilateral.cl
 share/darktable/kernels/blendop.cl
 share/darktable/kernels/demosaic_ppg.cl
+share/darktable/kernels/extended.cl
 share/darktable/kernels/gaussian.cl
 share/darktable/kernels/highpass.cl
 share/darktable/kernels/nlmeans.cl
 share/darktable/kernels/programs.conf
 share/darktable/kernels/sharpen.cl
+share/darktable/kernels/soften.cl
+share/darktable/latex/photobook.cls
+share/darktable/pixmaps/dt_logo_128x128.png
 share/darktable/pixmaps/idbutton.png
 share/darktable/pixmaps/off.png
 share/darktable/pixmaps/plugins/darkroom/anlfyeni.png
@@ -167,8 +190,19 @@ share/darktable/pixmaps/plugins/darkroom/watermark.png
 share/darktable/pixmaps/plugins/darkroom/zonesystem.png
 share/darktable/rawspeed/cameras.xml
 share/darktable/rawspeed/showcameras.xsl
+share/darktable/style/bullet.gif
+share/darktable/style/close.gif
+share/darktable/style/closelabel.gif
+share/darktable/style/donate-button.gif
+share/darktable/style/download-icon.gif
 share/darktable/style/favicon.ico
+share/darktable/style/image-1.jpg
+share/darktable/style/lightbox.css
+share/darktable/style/loading.gif
+share/darktable/style/nextlabel.gif
+share/darktable/style/prevlabel.gif
 share/darktable/style/style.css
+share/darktable/style/thumb-1.jpg
 share/darktable/watermarks/darktable.svg
 share/darktable/watermarks/hasselblad.svg
 share/darktable/watermarks/promo.svg
@@ -185,10 +219,20 @@ share/icons/hicolor/48x48/apps/darktable.png
 share/icons/hicolor/64x64/apps/darktable.png
 share/icons/hicolor/scalable/apps/darktable.svg
 share/locale/ca/LC_MESSAGES/darktable.mo
+share/locale/cs/LC_MESSAGES/darktable.mo
 share/locale/de/LC_MESSAGES/darktable.mo
+share/locale/es/LC_MESSAGES/darktable.mo
 share/locale/fi/LC_MESSAGES/darktable.mo
+share/locale/fr/LC_MESSAGES/darktable.mo
 share/locale/gl/LC_MESSAGES/darktable.mo
+share/locale/it/LC_MESSAGES/darktable.mo
+share/locale/ja/LC_MESSAGES/darktable.mo
+share/locale/nl/LC_MESSAGES/darktable.mo
+share/locale/pt_BR/LC_MESSAGES/darktable.mo
+share/locale/pt_PT/LC_MESSAGES/darktable.mo
 share/locale/ro/LC_MESSAGES/darktable.mo
+share/locale/ru/LC_MESSAGES/darktable.mo
 share/locale/sq/LC_MESSAGES/darktable.mo
+share/locale/sv/LC_MESSAGES/darktable.mo
 share/locale/th/LC_MESSAGES/darktable.mo
 share/locale/zh_CN/LC_MESSAGES/darktable.mo
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 63fb8b7a8ca..eb1a6fb0ba1 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,16 +1,12 @@
-$NetBSD: distinfo,v 1.13 2012/08/29 16:26:51 wiz Exp $
+$NetBSD: distinfo,v 1.14 2012/12/08 00:15:26 jakllsch Exp $
 
-SHA1 (darktable-1.0.5.tar.gz) = d007ada0f3fb3af6861de74323577b90eec3996e
-RMD160 (darktable-1.0.5.tar.gz) = e9740b7ebc045e8e52b42c41074888e423ff8c3e
-Size (darktable-1.0.5.tar.gz) = 2568221 bytes
+SHA1 (darktable-1.1.tar.gz) = b95dd87292e823fd42cd4cd495286ddf60d9b3a7
+RMD160 (darktable-1.1.tar.gz) = aa57951f049d06cd32740b89b5df870fba919c72
+Size (darktable-1.1.tar.gz) = 3423644 bytes
 SHA1 (patch-cmake_modules_FindGTK2.cmake) = de1273594801ab82da31b624845e0b36a77b53b3
-SHA1 (patch-src_CMakeLists.txt) = da62516e65b1c14eec4264fa603d9bdbd2e5d668
-SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 1217d6bf0b14b538d39e9bfe9fa70e2f7bffbfc5
-SHA1 (patch-src_common_darktable.c) = 1254eb162d30500c1a8a36935ea7491dc9e6c2da
-SHA1 (patch-src_common_darktable.h) = afa5122f22434496378edf5568fb610f1dc5b650
-SHA1 (patch-src_common_imageio__rgbe.c) = 71ac4e58bd89310323c25464bda8cb7a46c597cb
-SHA1 (patch-src_control_jobs_control__jobs.c) = 418bc906d7fb54d6c55060bf60f0e24b6b9d1f12
-SHA1 (patch-src_develop_blend.c) = 7411edf0903bbed7b4afcb82bc5c650100f23755
-SHA1 (patch-src_iop_lens.c) = 2c6613c4d46ec13085535e1106c32380e8fac1dc
-SHA1 (patch-src_iop_watermark.c) = 0b30f93011455fafc356dd861d1e0a078f647549
-SHA1 (patch-src_rawspeed_RawSpeed_Common.h) = c7dfc4e65ea46e7318d3d5ebdab6dcb5491c1c48
+SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 8227a7180383cd4379313b07ff964bb7fb9ce694
+SHA1 (patch-src_common_darktable.h) = 0a10dd74e60d60cd72e893cf3c7006e299440890
+SHA1 (patch-src_common_imageio__rgbe.c) = 5c396754d6dbb7390062e78afde315ee293215d6
+SHA1 (patch-src_control_control.c) = fcdd0fd7f5e0fcacb44e7f0ee768c824e9f8b774
+SHA1 (patch-src_develop_blend.c) = d847c5d6a9f2c0e914d1fced8eb76ce79f127f70
+SHA1 (patch-src_iop_lens.c) = 28b5462311f778184143152bdef4e59ee18a6a3f
diff --git a/graphics/darktable/patches/patch-src_CMakeLists.txt b/graphics/darktable/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index eaad35329f0..00000000000
--- a/graphics/darktable/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.6 2012/05/05 19:18:33 jakllsch Exp $
-
-Various thing to possibly improve portability.
-
---- src/CMakeLists.txt.orig	2012-04-27 20:25:52.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -242,36 +242,37 @@ if(NOT WIN32)
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
- endif(NOT WIN32)
- 
-+MESSAGE("-- Checking for -march=native support")
-+CHECK_C_COMPILER_FLAG("-march=native" MARCHNATIVE)
-+MESSAGE("-- Checking for -mtune=native support")
-+CHECK_C_COMPILER_FLAG("-mtune=native" MTUNENATIVE)
-+MESSAGE("-- Checking for -mtune=generic support")
-+CHECK_C_COMPILER_FLAG("-mtune=generic" MTUNEGENERIC)
-+
- if(NOT BINARY_PACKAGE_BUILD)
--	MESSAGE("-- Checking for -march=native support")
--	CHECK_C_COMPILER_FLAG("-march=native" MARCHNATIVE)
- 	if (MARCHNATIVE)
- 		set(MARCH "-march=native")	
- 	else()
--		MESSAGE("-- Checking for -mtune=native support")
--		CHECK_C_COMPILER_FLAG("-mtune=native" MTUNENATIVE)
- 		if (MTUNENATIVE)
- 			set(MARCH "-mtune=native")
- 		else()
--			set(MARCH "-mtune=generic")
-+			if (MTUNEGENERIC)
-+				set(MARCH "-mtune=generic")
-+			endif()
- 		endif()
- 	endif()
- else()
-- 	set(MARCH "-mtune=generic")
-+	if (MTUNEGENERIC)
-+		set(MARCH "-mtune=generic")
-+	endif()
- endif()
- 
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -g")
--set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations ${MARCH}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
-+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -ffast-math -fexpensive-optimizations ${MARCH}")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -g")
--set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations ${MARCH}")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
-+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -ffast-math -fexpensive-optimizations ${MARCH}")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG")
--if(CMAKE_COMPILER_IS_GNUCC)
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
--endif()
--if(CMAKE_COMPILER_IS_GNUCXX)
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
--endif()
- 
- #
- # Generate config.h
diff --git a/graphics/darktable/patches/patch-src_LibRaw_libraw_libraw__alloc.h b/graphics/darktable/patches/patch-src_LibRaw_libraw_libraw__alloc.h
index 18106a709cb..87b5f6b9c9d 100644
--- a/graphics/darktable/patches/patch-src_LibRaw_libraw_libraw__alloc.h
+++ b/graphics/darktable/patches/patch-src_LibRaw_libraw_libraw__alloc.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_LibRaw_libraw_libraw__alloc.h,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
+$NetBSD: patch-src_LibRaw_libraw_libraw__alloc.h,v 1.3 2012/12/08 00:15:26 jakllsch Exp $
 
 Work around redefined symbol.
 
---- src/external/LibRaw/libraw/libraw_alloc.h.orig	2011-08-24 09:20:29.000000000 +0000
+--- src/external/LibRaw/libraw/libraw_alloc.h.orig	2012-11-23 23:23:21.000000000 +0000
 +++ src/external/LibRaw/libraw/libraw_alloc.h
 @@ -27,6 +27,7 @@ it under the terms of the one of three l
  
diff --git a/graphics/darktable/patches/patch-src_common_darktable.c b/graphics/darktable/patches/patch-src_common_darktable.c
deleted file mode 100644
index 5ad5591bbc6..00000000000
--- a/graphics/darktable/patches/patch-src_common_darktable.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_common_darktable.c,v 1.1 2012/08/12 07:47:29 marino Exp $
-
---- src/common/darktable.c.orig	2012-07-21 10:44:08.000000000 +0000
-+++ src/common/darktable.c
-@@ -54,7 +54,7 @@
- #include <unistd.h>
- #include <locale.h>
- 
--#if !defined(__APPLE__) && !defined(__FreeBSD__)
-+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- #include <malloc.h>
- #endif
- #ifdef __APPLE__
diff --git a/graphics/darktable/patches/patch-src_common_darktable.h b/graphics/darktable/patches/patch-src_common_darktable.h
index 575c95e7b6b..72210773216 100644
--- a/graphics/darktable/patches/patch-src_common_darktable.h
+++ b/graphics/darktable/patches/patch-src_common_darktable.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_common_darktable.h,v 1.1 2012/08/12 07:47:29 marino Exp $
+$NetBSD: patch-src_common_darktable.h,v 1.2 2012/12/08 00:15:26 jakllsch Exp $
 
---- src/common/darktable.h.orig	2012-07-21 10:44:08.000000000 +0000
+--- src/common/darktable.h.orig	2012-11-23 23:23:21.000000000 +0000
 +++ src/common/darktable.h
-@@ -43,7 +43,7 @@
+@@ -47,7 +47,7 @@
  #include <mach/mach.h>
  #include <sys/sysctl.h>
  #endif
diff --git a/graphics/darktable/patches/patch-src_common_imageio__rgbe.c b/graphics/darktable/patches/patch-src_common_imageio__rgbe.c
index 09936a9967c..2b21b7b3f64 100644
--- a/graphics/darktable/patches/patch-src_common_imageio__rgbe.c
+++ b/graphics/darktable/patches/patch-src_common_imageio__rgbe.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_common_imageio__rgbe.c,v 1.1 2012/05/05 19:18:33 jakllsch Exp $
+$NetBSD: patch-src_common_imageio__rgbe.c,v 1.2 2012/12/08 00:15:26 jakllsch Exp $
 
---- src/common/imageio_rgbe.c.orig	2012-04-27 20:25:52.000000000 +0000
+--- src/common/imageio_rgbe.c.orig	2012-11-23 23:23:21.000000000 +0000
 +++ src/common/imageio_rgbe.c
 @@ -189,7 +189,7 @@ int RGBE_ReadHeader(FILE *fp, int *width
      info->valid |= RGBE_VALID_PROGRAMTYPE;
diff --git a/graphics/darktable/patches/patch-src_control_control.c b/graphics/darktable/patches/patch-src_control_control.c
new file mode 100644
index 00000000000..a5d967159b1
--- /dev/null
+++ b/graphics/darktable/patches/patch-src_control_control.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_control_control.c,v 1.1 2012/12/08 00:15:26 jakllsch Exp $
+
+--- src/control/control.c.orig	2012-11-23 23:23:21.000000000 +0000
++++ src/control/control.c
+@@ -594,7 +594,9 @@ void dt_control_init(dt_control_t *s)
+ 
+       // selected_images should have a primary key. add it if it's missing:
+       int is_in_primary_key = 0;
++#if 0
+       sqlite3_table_column_metadata(dt_database_get(darktable.db), NULL, "selected_images", "imgid", NULL, NULL, NULL, &is_in_primary_key, NULL);
++#endif
+       if(is_in_primary_key == 0)
+       {
+         sqlite3_exec(dt_database_get(darktable.db),
diff --git a/graphics/darktable/patches/patch-src_control_jobs_control__jobs.c b/graphics/darktable/patches/patch-src_control_jobs_control__jobs.c
deleted file mode 100644
index 5868d8bf006..00000000000
--- a/graphics/darktable/patches/patch-src_control_jobs_control__jobs.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_control_jobs_control__jobs.c,v 1.3 2012/05/05 19:18:33 jakllsch Exp $
-
---- src/control/jobs/control_jobs.c.orig	2012-04-27 20:25:52.000000000 +0000
-+++ src/control/jobs/control_jobs.c
-@@ -534,7 +534,7 @@ int32_t dt_control_export_job_run(dt_job
-   // GCC won't accept that this variable is used in a macro, considers
-   // it set but not used, which makes for instance Fedora break.
-   const __attribute__((__unused__)) int num_threads = MAX(1, MIN(full_entries, 8));
--#if !defined(__SUNOS__)
-+#if !defined(__SUNOS__) && !defined(__NetBSD__)
- #pragma omp parallel default(none) private(imgid, size) shared(control, fraction, w, h, stderr, mformat, mstorage, t, sdata, job, jid, darktable) num_threads(num_threads) if(num_threads > 1)
- #else
- #pragma omp parallel private(imgid, size) shared(control, fraction, w, h, mformat, mstorage, t, sdata, job, jid, darktable) num_threads(num_threads) if(num_threads > 1)
diff --git a/graphics/darktable/patches/patch-src_develop_blend.c b/graphics/darktable/patches/patch-src_develop_blend.c
index 36511e4318c..1caa0024049 100644
--- a/graphics/darktable/patches/patch-src_develop_blend.c
+++ b/graphics/darktable/patches/patch-src_develop_blend.c
@@ -1,13 +1,22 @@
-$NetBSD: patch-src_develop_blend.c,v 1.2 2012/03/16 00:35:01 jakllsch Exp $
+$NetBSD: patch-src_develop_blend.c,v 1.3 2012/12/08 00:15:26 jakllsch Exp $
 
---- src/develop/blend.c.orig	2012-03-13 21:29:39.000000000 +0000
+--- src/develop/blend.c.orig	2012-11-23 23:23:21.000000000 +0000
 +++ src/develop/blend.c
-@@ -1230,7 +1230,7 @@ void dt_develop_blend_process (struct dt
-       ch = 1;
-     
+@@ -1718,7 +1718,7 @@ void dt_develop_blend_process (struct dt
+     if(self->suppress_mask && self->dev->gui_attached && self == self->dev->gui_module && piece->pipe == self->dev->pipe && (d->blendif & (1<<31)))
+     {
  #ifdef _OPENMP
 -#if !defined(__SUNOS__)
 +#if !defined(__SUNOS__) && !defined(__NetBSD__)
-     #pragma omp parallel for default(none) shared(in,roi_out,out,blend,d,stderr,ch)
+     #pragma omp parallel for default(none) shared(roi_out,mask,stderr)
  #else
-     #pragma omp parallel for shared(in,roi_out,out,blend,d,ch)
+     #pragma omp parallel for shared(roi_out,mask)
+@@ -1733,7 +1733,7 @@ void dt_develop_blend_process (struct dt
+ 
+ 
+ #ifdef _OPENMP
+-#if !defined(__SUNOS__)
++#if !defined(__SUNOS__) && !defined(__NetBSD__)
+     #pragma omp parallel for default(none) shared(i,roi_out,o,mask,blend,stderr,ch)
+ #else
+     #pragma omp parallel for shared(i,roi_out,o,mask,blend,ch)
diff --git a/graphics/darktable/patches/patch-src_iop_lens.c b/graphics/darktable/patches/patch-src_iop_lens.c
index 470b48719bb..b954fb39742 100644
--- a/graphics/darktable/patches/patch-src_iop_lens.c
+++ b/graphics/darktable/patches/patch-src_iop_lens.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_iop_lens.c,v 1.1 2012/05/05 19:18:33 jakllsch Exp $
+$NetBSD: patch-src_iop_lens.c,v 1.2 2012/12/08 00:15:26 jakllsch Exp $
 
---- src/iop/lens.c.orig	2012-04-27 20:25:52.000000000 +0000
+--- src/iop/lens.c.orig	2012-11-23 23:23:21.000000000 +0000
 +++ src/iop/lens.c
-@@ -842,7 +842,7 @@ static void parse_maker_model (
+@@ -1106,7 +1106,7 @@ static void parse_maker_model (
  {
    const gchar *sep;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-src_iop_lens.c,v 1.1 2012/05/05 19:18:33 jakllsch Exp $
      txt++;
    sep = strchr (txt, ',');
    if (sep)
-@@ -853,7 +853,7 @@ static void parse_maker_model (
+@@ -1117,7 +1117,7 @@ static void parse_maker_model (
      memcpy (make, txt, len);
      make [len] = 0;
  
diff --git a/graphics/darktable/patches/patch-src_iop_watermark.c b/graphics/darktable/patches/patch-src_iop_watermark.c
deleted file mode 100644
index d6a803d4f2b..00000000000
--- a/graphics/darktable/patches/patch-src_iop_watermark.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_iop_watermark.c,v 1.1 2012/08/29 16:26:51 wiz Exp $
-
-Direct inclusion of this header is deprecated.
-
---- src/iop/watermark.c.orig	2012-07-21 10:44:08.000000000 +0000
-+++ src/iop/watermark.c
-@@ -38,7 +38,6 @@
- #include <inttypes.h>
- 
- #include <librsvg/rsvg.h>
--#include <librsvg/rsvg-cairo.h>
- 
- #include "common/metadata.h"
- #include "common/utility.h"
diff --git a/graphics/darktable/patches/patch-src_rawspeed_RawSpeed_Common.h b/graphics/darktable/patches/patch-src_rawspeed_RawSpeed_Common.h
deleted file mode 100644
index ec8765d2d55..00000000000
--- a/graphics/darktable/patches/patch-src_rawspeed_RawSpeed_Common.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_rawspeed_RawSpeed_Common.h,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
-
-Move typedef to correct place.
-
---- src/external/rawspeed/RawSpeed/Common.h.orig	2011-08-24 09:20:29.000000000 +0000
-+++ src/external/rawspeed/RawSpeed/Common.h
-@@ -42,8 +42,8 @@ void* _aligned_malloc(size_t bytes, size
- #define _aligned_free(a) do { free(a); } while (0)
- #ifndef MIN
- #define MIN(a, b)  lmin(a,b)
--typedef unsigned long long uint64;
- #endif
-+typedef unsigned long long uint64;
- #ifndef MAX
- #define MAX(a, b)  lmax(a,b)
- #endif