summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2016-12-23 03:53:16 +0000
committerryoon <ryoon@pkgsrc.org>2016-12-23 03:53:16 +0000
commitf48a89ad3798f76f76fb0de5a250fbe4a2f4784e (patch)
tree6ececfd5b97763aa68939bcbe67596a6bb1d52c1
parent7017553e0457a8cf7b0e6b51d62b821e2008b3af (diff)
downloadpkgsrc-f48a89ad3798f76f76fb0de5a250fbe4a2f4784e.tar.gz
Back to 2.0.7 really. Previsous 2.2.0rc3 commit is my mistake
-rw-r--r--graphics/darktable/Makefile9
-rw-r--r--graphics/darktable/PLIST37
-rw-r--r--graphics/darktable/distinfo12
-rw-r--r--graphics/darktable/patches/patch-aa18
-rw-r--r--graphics/darktable/patches/patch-cmake_modules_FindFreetype.cmake15
-rw-r--r--graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake21
-rw-r--r--graphics/darktable/patches/patch-src_LibRaw_libraw_libraw__alloc.h14
-rw-r--r--graphics/darktable/patches/patch-src_common_imageio__exr.hh31
-rw-r--r--graphics/darktable/patches/patch-src_common_imageio__rgbe.c13
-rw-r--r--graphics/darktable/patches/patch-src_develop_blend.c28
-rw-r--r--graphics/darktable/patches/patch-src_iop_invert.c13
-rw-r--r--graphics/darktable/patches/patch-src_iop_lens.c22
-rw-r--r--graphics/darktable/patches/patch-tools_noise_benchmark.sh13
13 files changed, 32 insertions, 214 deletions
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index f9a374e6cb0..63a7623ddc8 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.66 2016/12/23 03:38:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2016/12/23 03:53:16 ryoon Exp $
-DISTNAME= darktable-2.2.0.rc3
-PKGNAME= ${DISTNAME:S/.rc/rc/}
+DISTNAME= darktable-2.0.7
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=darktable-org/}
GITHUB_PROJECT= darktable
-GITHUB_RELEASE= release-${PKGVERSION_NOREV}
+GITHUB_RELEASE= release-${PKGVERSION_NOREV}
EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -13,8 +12,6 @@ HOMEPAGE= http://www.darktable.org/
COMMENT= Photography workflow application
LICENSE= gnu-gpl-v3
-WRKSRC= ${WRKDIR}/${DISTNAME:S/.rc/~rc/}
-
USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
diff --git a/graphics/darktable/PLIST b/graphics/darktable/PLIST
index f16b9a227e1..bfd026e730a 100644
--- a/graphics/darktable/PLIST
+++ b/graphics/darktable/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.11 2016/12/23 03:38:24 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/12/23 03:53:16 ryoon Exp $
bin/darktable
-bin/darktable-chart
bin/darktable-cli
bin/darktable-cmstest
bin/darktable-generate-cache
-bin/darktable-rs-identify
+bin/darktable-viewer
lib/darktable/libdarktable.so
lib/darktable/plugins/imageio/format/libcopy.so
lib/darktable/plugins/imageio/format/libexr.so
@@ -21,7 +20,6 @@ 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/libashift.so
lib/darktable/plugins/libatrous.so
lib/darktable/plugins/libbasecurve.so
lib/darktable/plugins/libbilat.so
@@ -34,7 +32,6 @@ lib/darktable/plugins/libclahe.so
lib/darktable/plugins/libclipping.so
lib/darktable/plugins/libcolisa.so
lib/darktable/plugins/libcolorbalance.so
-lib/darktable/plugins/libcolorchecker.so
lib/darktable/plugins/libcolorcontrast.so
lib/darktable/plugins/libcolorcorrection.so
lib/darktable/plugins/libcolorin.so
@@ -62,7 +59,6 @@ lib/darktable/plugins/libhotpixels.so
lib/darktable/plugins/libinvert.so
lib/darktable/plugins/liblens.so
lib/darktable/plugins/liblevels.so
-lib/darktable/plugins/libliquify.so
lib/darktable/plugins/liblowlight.so
lib/darktable/plugins/liblowpass.so
lib/darktable/plugins/libmonochrome.so
@@ -70,7 +66,6 @@ lib/darktable/plugins/libnlmeans.so
lib/darktable/plugins/liboverexposed.so
lib/darktable/plugins/libprofile_gamma.so
lib/darktable/plugins/librawdenoise.so
-lib/darktable/plugins/librawoverexposed.so
lib/darktable/plugins/librawprepare.so
lib/darktable/plugins/librelight.so
lib/darktable/plugins/librotatepixels.so
@@ -98,7 +93,6 @@ 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
@@ -134,12 +128,19 @@ man/man1/darktable-cli.1
man/man1/darktable-cltest.1
man/man1/darktable-cmstest.1
man/man1/darktable-generate-cache.1
+man/man1/darktable-viewer.1
man/man1/darktable.1
share/appdata/darktable.appdata.xml
share/applications/darktable.desktop
share/darktable/darktable.css
share/darktable/darktablerc
share/darktable/gdb_commands
+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/latex/photobook.cls
share/darktable/lua/darktable/debug.lua
share/darktable/lua/darktable/external/pygy_require/.gitignore
@@ -168,8 +169,6 @@ share/darktable/pixmaps/idbutton-3.png
share/darktable/pixmaps/idbutton-3.svg
share/darktable/pixmaps/idbutton.png
share/darktable/pixmaps/idbutton.svg
-share/darktable/pixmaps/plugins/darkroom/ashift.png
-share/darktable/pixmaps/plugins/darkroom/ashift.svg
share/darktable/pixmaps/plugins/darkroom/atrous.png
share/darktable/pixmaps/plugins/darkroom/atrous.svg
share/darktable/pixmaps/plugins/darkroom/basecurve.png
@@ -228,8 +227,6 @@ share/darktable/pixmaps/plugins/darkroom/lens.png
share/darktable/pixmaps/plugins/darkroom/lens.svg
share/darktable/pixmaps/plugins/darkroom/levels.png
share/darktable/pixmaps/plugins/darkroom/levels.svg
-share/darktable/pixmaps/plugins/darkroom/liquify.png
-share/darktable/pixmaps/plugins/darkroom/liquify.svg
share/darktable/pixmaps/plugins/darkroom/lowlight.png
share/darktable/pixmaps/plugins/darkroom/lowlight.svg
share/darktable/pixmaps/plugins/darkroom/lowpass.png
@@ -276,16 +273,6 @@ share/darktable/pixmaps/plugins/darkroom/watermark.png
share/darktable/pixmaps/plugins/darkroom/watermark.svg
share/darktable/pixmaps/plugins/darkroom/zonesystem.png
share/darktable/pixmaps/plugins/darkroom/zonesystem.svg
-share/darktable/pswp/LICENSE
-share/darktable/pswp/default-skin/default-skin.css
-share/darktable/pswp/default-skin/default-skin.png
-share/darktable/pswp/default-skin/default-skin.svg
-share/darktable/pswp/default-skin/preloader.gif
-share/darktable/pswp/photoswipe-ui-default.js
-share/darktable/pswp/photoswipe-ui-default.min.js
-share/darktable/pswp/photoswipe.css
-share/darktable/pswp/photoswipe.js
-share/darktable/pswp/photoswipe.min.js
share/darktable/rawspeed/cameras.xml
share/darktable/rawspeed/showcameras.xsl
share/darktable/style/bullet.gif
@@ -321,16 +308,13 @@ share/icons/hicolor/scalable/apps/darktable-1.svg
share/icons/hicolor/scalable/apps/darktable-2.svg
share/icons/hicolor/scalable/apps/darktable-3.svg
share/icons/hicolor/scalable/apps/darktable.svg
-share/locale/af/LC_MESSAGES/darktable.mo
share/locale/ca/LC_MESSAGES/darktable.mo
share/locale/cs/LC_MESSAGES/darktable.mo
share/locale/da/LC_MESSAGES/darktable.mo
share/locale/de/LC_MESSAGES/darktable.mo
share/locale/el/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/he/LC_MESSAGES/darktable.mo
share/locale/hu/LC_MESSAGES/darktable.mo
share/locale/it/LC_MESSAGES/darktable.mo
@@ -339,12 +323,9 @@ share/locale/nl/LC_MESSAGES/darktable.mo
share/locale/pl/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/sk/LC_MESSAGES/darktable.mo
share/locale/sl/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/uk/LC_MESSAGES/darktable.mo
-share/locale/zh_CN/LC_MESSAGES/darktable.mo
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 56bc8fd7d00..9e4ebe4fbd8 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2016/12/23 03:38:24 ryoon Exp $
+$NetBSD: distinfo,v 1.26 2016/12/23 03:53:16 ryoon Exp $
-SHA1 (darktable-2.2.0.rc3.tar.xz) = cd03d0287eda42f69ee946ab123ab4c2d469090c
-RMD160 (darktable-2.2.0.rc3.tar.xz) = 3f98692b30a678b0dbed66ddf013a4de4e495b6f
-SHA512 (darktable-2.2.0.rc3.tar.xz) = 8565c142e8d44dd7627c94b556a6a491269ae26f3a239e4c24372e3d8e149a9ad95099fb5ac1f7bfd331102094db6ea0f5db8a96463ccf8a2749d502dfdfc6fb
-Size (darktable-2.2.0.rc3.tar.xz) = 3262016 bytes
-SHA1 (patch-tools_noise_benchmark.sh) = 204e8348570703ea1356f9ecce641116ee40905b
+SHA1 (darktable-2.0.7.tar.xz) = c9392af5df0045b36b89c6548b9ff552f34b7e15
+RMD160 (darktable-2.0.7.tar.xz) = 6d9e7bf1507e2e25a3359bc0b853fb62e4078b26
+SHA512 (darktable-2.0.7.tar.xz) = 568db128bdf1d639d387f32a65ea40e0a706f16b6ec0915c9580255c0385033e3d80c3ddf5c15c3f8adccd1f23530f430c9eb28f9d2771f61ae5a5c479726928
+Size (darktable-2.0.7.tar.xz) = 2960436 bytes
+SHA1 (patch-src_develop_blend.c) = d8b5d72fac9544b37e856c57d511423483c14a9b
diff --git a/graphics/darktable/patches/patch-aa b/graphics/darktable/patches/patch-aa
deleted file mode 100644
index 7c8c900f3f8..00000000000
--- a/graphics/darktable/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2013/12/04 13:02:08 drochner Exp $
-
---- src/common/utility.c.orig 2013-09-10 12:25:47.000000000 +0000
-+++ src/common/utility.c
-@@ -17,13 +17,11 @@
- */
-
- /* getpwnam_r availibility check */
--#if defined __APPLE__ || defined _POSIX_C_SOURCE >= 1 || defined _XOPEN_SOURCE || defined _BSD_SOURCE || defined _SVID_SOURCE || defined _POSIX_SOURCE
- #include <pwd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include "darktable.h"
--#endif
-
- #ifdef HAVE_CONFIG_H
- #include <config.h>
diff --git a/graphics/darktable/patches/patch-cmake_modules_FindFreetype.cmake b/graphics/darktable/patches/patch-cmake_modules_FindFreetype.cmake
deleted file mode 100644
index 0a4b3aedf55..00000000000
--- a/graphics/darktable/patches/patch-cmake_modules_FindFreetype.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cmake_modules_FindFreetype.cmake,v 1.1 2014/03/23 15:16:35 spz Exp $
-
-make it deal gracefully with both freetype 2.4.* and 2.5.*
-
---- cmake/modules/FindFreetype.cmake.orig 2013-09-10 12:25:47.000000000 +0000
-+++ cmake/modules/FindFreetype.cmake
-@@ -12,7 +12,7 @@ libfind_pkg_check_modules(Freetype_PKGCO
-
- # Include dir
- find_path(Freetype_INCLUDE_DIR
-- NAMES freetype/freetype.h
-+ NAMES ft2build.h
- PATHS ${Freetype_PKGCONF_INCLUDE_DIRS}
- PATH_SUFFIXES freetype2
- )
diff --git a/graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake b/graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake
deleted file mode 100644
index 5de479cde64..00000000000
--- a/graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-cmake_modules_FindGTK2.cmake,v 1.3 2011/11/20 01:16:23 dholland Exp $
-
-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
-@@ -184,6 +184,9 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd
- /usr/openwin/lib
- /sw/include
- /sw/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
diff --git a/graphics/darktable/patches/patch-src_LibRaw_libraw_libraw__alloc.h b/graphics/darktable/patches/patch-src_LibRaw_libraw_libraw__alloc.h
deleted file mode 100644
index 87b5f6b9c9d..00000000000
--- a/graphics/darktable/patches/patch-src_LibRaw_libraw_libraw__alloc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$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 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
-
- #ifdef __cplusplus
-
-+#undef MSIZE
- #define MSIZE 32
-
- class DllDef libraw_memmgr
diff --git a/graphics/darktable/patches/patch-src_common_imageio__exr.hh b/graphics/darktable/patches/patch-src_common_imageio__exr.hh
deleted file mode 100644
index a3db7a0c340..00000000000
--- a/graphics/darktable/patches/patch-src_common_imageio__exr.hh
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_common_imageio__exr.hh,v 1.3 2013/12/04 13:02:08 drochner Exp $
-
-stdc++ fixes from joerg
-
---- src/common/imageio_exr.hh.orig 2013-06-24 18:35:28.000000000 +0000
-+++ src/common/imageio_exr.hh
-@@ -21,7 +21,15 @@
- #include "common/image.h"
- #include "common/mipmap_cache.h"
-
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <memory>
-+using std::shared_ptr;
-+#else
- #include <tr1/memory>
-+using std::tr1::shared_ptr;
-+#endif
-
- #include <OpenEXR/ImfFrameBuffer.h>
- #include <OpenEXR/ImfTestFile.h>
-@@ -56,7 +64,7 @@ public:
- }
-
- uint32_t size;
-- std::tr1::shared_ptr<uint8_t> data;
-+ shared_ptr<uint8_t> data;
- };
-
-
diff --git a/graphics/darktable/patches/patch-src_common_imageio__rgbe.c b/graphics/darktable/patches/patch-src_common_imageio__rgbe.c
deleted file mode 100644
index 2b21b7b3f64..00000000000
--- a/graphics/darktable/patches/patch-src_common_imageio__rgbe.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$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-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;
- for(i=0; i<sizeof(info->programtype)-1; i++)
- {
-- if ((buf[i+2] == 0) || isspace(buf[i+2]))
-+ if ((buf[i+2] == 0) || isspace((unsigned char)buf[i+2]))
- break;
- info->programtype[i] = buf[i+2];
- }
diff --git a/graphics/darktable/patches/patch-src_develop_blend.c b/graphics/darktable/patches/patch-src_develop_blend.c
index 76aae79f935..028f82e15a8 100644
--- a/graphics/darktable/patches/patch-src_develop_blend.c
+++ b/graphics/darktable/patches/patch-src_develop_blend.c
@@ -1,22 +1,22 @@
-$NetBSD: patch-src_develop_blend.c,v 1.4 2013/12/04 13:02:08 drochner Exp $
+$NetBSD: patch-src_develop_blend.c,v 1.5 2016/12/23 03:53:16 ryoon Exp $
---- src/develop/blend.c.orig 2013-06-24 18:35:28.000000000 +0000
+--- src/develop/blend.c.orig 2016-10-23 15:18:57.000000000 +0000
+++ src/develop/blend.c
-@@ -1758,7 +1758,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)))
+@@ -2695,7 +2695,7 @@ void dt_develop_blend_process(struct dt_
+ && (piece->pipe == self->dev->pipe) && (mask_mode & DEVELOP_MASK_BOTH))
{
#ifdef _OPENMP
--#if !defined(__SUNOS__)
-+#if !defined(__SUNOS__) && !defined(__NetBSD__)
- #pragma omp parallel for default(none) shared(roi_out,mask,stderr)
+-#if !defined(__SUNOS__) && !defined(__WIN32__)
++#if !defined(__SUNOS__) && !defined(__WIN32__) && !defined(__NetBSD__)
+ #pragma omp parallel for default(none) shared(roi_out, mask, stderr)
#else
- #pragma omp parallel for shared(roi_out,mask)
-@@ -1773,7 +1773,7 @@ void dt_develop_blend_process (struct dt
-
+ #pragma omp parallel for shared(roi_out, mask)
+@@ -2710,7 +2710,7 @@ void dt_develop_blend_process(struct dt_
+ /* now apply blending with per-pixel opacity value as defined in mask */
#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)
+-#if !defined(__SUNOS__) && !defined(__WIN32__)
++#if !defined(__SUNOS__) && !defined(__WIN32__) && !defined(__NetBSD__)
+ #pragma omp parallel for default(none) shared(i, roi_out, o, mask, blend, stderr)
#else
- #pragma omp parallel for shared(i,roi_out,o,mask,blend,ch)
+ #pragma omp parallel for shared(i, roi_out, o, mask, blend)
diff --git a/graphics/darktable/patches/patch-src_iop_invert.c b/graphics/darktable/patches/patch-src_iop_invert.c
deleted file mode 100644
index ceb856635ab..00000000000
--- a/graphics/darktable/patches/patch-src_iop_invert.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_iop_invert.c,v 1.1 2015/09/23 11:52:15 joerg Exp $
-
---- src/iop/invert.c.orig 2015-09-22 13:04:15.000000000 +0000
-+++ src/iop/invert.c
-@@ -199,7 +199,7 @@ void process (struct dt_iop_module_t *se
- const float *const m = piece->pipe->processed_maximum;
- const int32_t film_rgb_i[3] = {m[0]*film_rgb[0]*65535, m[1]*film_rgb[1]*65535, m[2]*film_rgb[2]*65535};
- #ifdef _OPENMP
-- #pragma omp parallel for default(none) shared(roi_out, ivoid, ovoid, /*film_rgb_i, min, max, res*/) schedule(static)
-+ #pragma omp parallel for default(none) shared(roi_out, ivoid, ovoid/*, film_rgb_i, min, max, res*/) schedule(static)
- #endif
- for(int j=0; j<roi_out->height; j++)
- {
diff --git a/graphics/darktable/patches/patch-src_iop_lens.c b/graphics/darktable/patches/patch-src_iop_lens.c
deleted file mode 100644
index b954fb39742..00000000000
--- a/graphics/darktable/patches/patch-src_iop_lens.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_iop_lens.c,v 1.2 2012/12/08 00:15:26 jakllsch Exp $
-
---- src/iop/lens.c.orig 2012-11-23 23:23:21.000000000 +0000
-+++ src/iop/lens.c
-@@ -1106,7 +1106,7 @@ static void parse_maker_model (
- {
- const gchar *sep;
-
-- while (txt [0] && isspace (txt [0]))
-+ while (txt [0] && isspace ((unsigned char)txt [0]))
- txt++;
- sep = strchr (txt, ',');
- if (sep)
-@@ -1117,7 +1117,7 @@ static void parse_maker_model (
- memcpy (make, txt, len);
- make [len] = 0;
-
-- while (*++sep && isspace (sep [0]))
-+ while (*++sep && isspace ((unsigned char)sep [0]))
- ;
- len = strlen (sep);
- if (len > sz_model - 1)
diff --git a/graphics/darktable/patches/patch-tools_noise_benchmark.sh b/graphics/darktable/patches/patch-tools_noise_benchmark.sh
deleted file mode 100644
index 3be41a047bb..00000000000
--- a/graphics/darktable/patches/patch-tools_noise_benchmark.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-tools_noise_benchmark.sh,v 1.1 2016/12/23 03:38:24 ryoon Exp $
-
---- tools/noise/benchmark.sh.orig 2016-12-11 18:49:55.000000000 +0000
-+++ tools/noise/benchmark.sh
-@@ -14,7 +14,7 @@ REF="reference.pfm"
-
- for i in *.pfm
- do
-- if [ "$i" == "$REF" ]
-+ if [ "$i" = "$REF" ]
- then
- continue
- fi