CVS commit: pkgsrc/graphics/gimp-ufraw

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Feb 22 14:40:26 UTC 2025

Modified Files:
        pkgsrc/graphics/gimp-ufraw: DESCR Makefile PLIST
Added Files:
        pkgsrc/graphics/gimp-ufraw: options.mk

Log Message:
graphics/gimp-ufraw: Add default-off gimp option and clean up

  - Add a gimp option, so this can be built with or without the
    gimp(2) plugin.  Default it to off, because gimp3 is nearly here
    and 100% of known users have switched to gimp3.
  - Clean up (c99 moving to USE_CC_FEATURES, sort bl3, prune comments).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gimp-ufraw/DESCR
cvs rdiff -u -r1.153 -r1.154 pkgsrc/graphics/gimp-ufraw/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/gimp-ufraw/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gimp-ufraw/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gimp-ufraw/DESCR
diff -u pkgsrc/graphics/gimp-ufraw/DESCR:1.2 pkgsrc/graphics/gimp-ufraw/DESCR:1.3
--- pkgsrc/graphics/gimp-ufraw/DESCR:1.2        Sun Jul 17 21:46:51 2005
+++ pkgsrc/graphics/gimp-ufraw/DESCR    Sat Feb 22 14:40:25 2025
@@ -1,5 +1,5 @@
 UFRaw is a utility to read and manipulate raw images from digital cameras.
-It can be used by itself or as a GIMP plug-in.
+It can be used by itself or (optionally) as a GIMP2 plug-in.
 It reads raw images using Dave Coffin's raw conversion utility DCRaw.
 And it supports basic color management using Little CMS, allowing
 the user to apply color profiles.

Index: pkgsrc/graphics/gimp-ufraw/Makefile
diff -u pkgsrc/graphics/gimp-ufraw/Makefile:1.153 pkgsrc/graphics/gimp-ufraw/Makefile:1.154
--- pkgsrc/graphics/gimp-ufraw/Makefile:1.153   Mon Jan  6 21:49:21 2025
+++ pkgsrc/graphics/gimp-ufraw/Makefile Sat Feb 22 14:40:25 2025
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.153 2025/01/06 21:49:21 ktnb Exp $
+# $NetBSD: Makefile,v 1.154 2025/02/22 14:40:25 gdt Exp $
 
 DISTNAME=              ufraw-0.22
 PKGNAME=               gimp-${DISTNAME}
-PKGREVISION=           48
+PKGREVISION=           49
 CATEGORIES=            graphics
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ufraw/}
 
-# There have been issues with unstable OPENMP APIs.  Therefore,
-# updates must be tested on NetBSD 9 with gcc.
 MAINTAINER=            gdt%NetBSD.org@localhost
 HOMEPAGE=              https://ufraw.sourceforge.net/
-COMMENT=               GIMP plug-in for raw digicam import
+COMMENT=               Converter from camera RAW
 
 LICENSE=               gnu-gpl-v2
 
@@ -18,37 +16,27 @@ GNU_CONFIGURE=              yes
 
 USE_TOOLS+=            gmake pkg-config msgfmt
 USE_TOOLS+=            perl:run pod2man
-USE_LANGUAGES=         c99 c++
-
-# exiv2 is declared to need filesystem, but as of 2023-08 it fails if
-# called with --std=c++03.  We avoid forcing std.  (pkgsrc lacks a
-# mechanism to declare which --stds are acceptable and thus exiv2
-# doesn't declare this.)
+USE_LANGUAGES=         c c++
+USE_CC_FEATURES=       c99
 
 CONFIGURE_ARGS+=       --enable-mime
 
 GCONF_SCHEMAS=         ufraw.schemas
 
+# \todo Understand why pthread is present at all and remove it.
 PTHREAD_AUTO_VARS=     yes
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.ufraw
-PKG_SUPPORTED_OPTIONS= lensfun
-PKG_SUGGESTED_OPTIONS= lensfun
-.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mlensfun)
-.include "../../graphics/lensfun/buildlink3.mk"
-.endif
+.include "options.mk"
 
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../devel/GConf/schemas.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
-.include "../../graphics/gimp/buildlink3.mk"
 .include "../../graphics/gtkimageview/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/gimp-ufraw/PLIST
diff -u pkgsrc/graphics/gimp-ufraw/PLIST:1.16 pkgsrc/graphics/gimp-ufraw/PLIST:1.17
--- pkgsrc/graphics/gimp-ufraw/PLIST:1.16       Sun Dec 14 16:09:29 2014
+++ pkgsrc/graphics/gimp-ufraw/PLIST    Sat Feb 22 14:40:25 2025
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.16 2014/12/14 16:09:29 gdt Exp $
+@comment $NetBSD: PLIST,v 1.17 2025/02/22 14:40:25 gdt Exp $
 bin/ufraw
 bin/ufraw-batch
-lib/gimp/2.0/plug-ins/ufraw-gimp
+${PLIST.gimp}lib/gimp/2.0/plug-ins/ufraw-gimp
 man/man1/ufraw.1
 share/appdata/ufraw.appdata.xml
 share/applications/ufraw.desktop

Added files:

Index: pkgsrc/graphics/gimp-ufraw/options.mk
diff -u /dev/null pkgsrc/graphics/gimp-ufraw/options.mk:1.1
--- /dev/null   Sat Feb 22 14:40:26 2025
+++ pkgsrc/graphics/gimp-ufraw/options.mk       Sat Feb 22 14:40:25 2025
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2025/02/22 14:40:25 gdt Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ufraw
+PKG_SUPPORTED_OPTIONS= gimp lensfun
+PKG_SUGGESTED_OPTIONS= lensfun
+
+.include "../../mk/bsd.options.mk"
+
+# gimp support only works with gimp2.  gimp3 is imminent (and 1 of 1
+# known users have switched to gimp3).
+PLIST_VARS+=   gimp
+.if !empty(PKG_OPTIONS:Mgimp)
+.include "../../graphics/gimp/buildlink3.mk"
+PLIST.gimp=    yes
+.endif
+
+.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mlensfun)
+.include "../../graphics/lensfun/buildlink3.mk"
+.endif