CVS commit: pkgsrc/graphics/gimp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jun 13 06:46:19 UTC 2025

Modified Files:
        pkgsrc/graphics/gimp: Makefile PLIST options.mk

Log Message:
gimp: directly use ghostscript-agpl

since this doesn't compile with ghostscript-gpl, see PR 59464

make the ghostscript-agpl dependency a default-on option

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.413 -r1.414 pkgsrc/graphics/gimp/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/graphics/gimp/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/gimp/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/Makefile
diff -u pkgsrc/graphics/gimp/Makefile:1.413 pkgsrc/graphics/gimp/Makefile:1.414
--- pkgsrc/graphics/gimp/Makefile:1.413 Mon May 19 11:20:01 2025
+++ pkgsrc/graphics/gimp/Makefile       Fri Jun 13 06:46:19 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.413 2025/05/19 11:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.414 2025/06/13 06:46:19 wiz Exp $
 
 DISTNAME=      gimp-3.0.4
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.xz
@@ -50,8 +51,6 @@ REPLACE_PYTHON+=      plug-ins/python/*/*.py
 REPLACE_PYTHON+=       tools/*.py
 REPLACE_PYTHON+=       extensions/goat-exercises/goat-exercise-py3.py
 
-REPLACE_SH=            tools/in-build-gimp.sh
-
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/gimp/3.0
 EGDIR=                 ${PREFIX}/share/examples/gimp
 .for f in controllerrc gimp.css gimprc sessionrc templaterc toolrc unitrc
@@ -122,7 +121,6 @@ BUILDLINK_API_DEPENDS.tiff+=        tiff>=4.0
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/vala/buildlink3.mk"
-.include "../../print/ghostscript/buildlink3.mk"
 .include "../../print/poppler-data/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler+=        poppler>=23.12.0
 .include "../../print/poppler/buildlink3.mk"

Index: pkgsrc/graphics/gimp/PLIST
diff -u pkgsrc/graphics/gimp/PLIST:1.83 pkgsrc/graphics/gimp/PLIST:1.84
--- pkgsrc/graphics/gimp/PLIST:1.83     Mon May 19 11:20:01 2025
+++ pkgsrc/graphics/gimp/PLIST  Fri Jun 13 06:46:19 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.83 2025/05/19 11:20:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.84 2025/06/13 06:46:19 wiz Exp $
 bin/gimp
 bin/gimp-3
 bin/gimp-3.0
@@ -395,7 +395,7 @@ lib/gimp/3.0/plug-ins/file-pdf-load/file
 lib/gimp/3.0/plug-ins/file-pix/file-pix
 lib/gimp/3.0/plug-ins/file-png/file-png
 lib/gimp/3.0/plug-ins/file-pnm/file-pnm
-lib/gimp/3.0/plug-ins/file-ps/file-ps
+${PLIST.ghostscript}lib/gimp/3.0/plug-ins/file-ps/file-ps
 lib/gimp/3.0/plug-ins/file-psd/file-psd
 lib/gimp/3.0/plug-ins/file-psp/file-psp
 lib/gimp/3.0/plug-ins/file-raw-data/file-raw-data

Index: pkgsrc/graphics/gimp/options.mk
diff -u pkgsrc/graphics/gimp/options.mk:1.11 pkgsrc/graphics/gimp/options.mk:1.12
--- pkgsrc/graphics/gimp/options.mk:1.11        Mon May 19 11:20:01 2025
+++ pkgsrc/graphics/gimp/options.mk     Fri Jun 13 06:46:19 2025
@@ -1,27 +1,35 @@
-# $NetBSD: options.mk,v 1.11 2025/05/19 11:20:01 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2025/06/13 06:46:19 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gimp
-PKG_SUPPORTED_OPTIONS= aalib mng xpm
-PKG_SUGGESTED_OPTIONS= mng xpm
+PKG_SUPPORTED_OPTIONS= aalib ghostscript mng xpm
+PKG_SUGGESTED_OPTIONS= ghostscript mng xpm
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           aalib mng xpm
+PLIST_VARS+=           aalib ghostscript mng xpm
 
+PRINT_PLIST_AWK+=       { if (/file-aa/) $$0 = "$${PLIST.aalib}" $$0 }
 .if !empty(PKG_OPTIONS:Maalib)
 .include "../../graphics/aalib/buildlink3.mk"
-PRINT_PLIST_AWK+=       { if (/file-aa/) $$0 = "$${PLIST.aalib}" $$0 }
 PLIST.aalib=           yes
 .endif
 
+PRINT_PLIST_AWK+=       { if (/file-ps$$/) $$0 = "$${PLIST.ghostscript}" $$0 }
+.if !empty(PKG_OPTIONS:Mghostscript)
+.include "../../print/ghostscript-agpl/buildlink3.mk"
+PLIST.ghostscript=     yes
+.else
+MESON_ARGS+=   -Dghostscript=disabled
+.endif
+
+PRINT_PLIST_AWK+=       { if (/file-mng/) $$0 = "$${PLIST.mng}" $$0 }
 .if !empty(PKG_OPTIONS:Mmng)
 .include "../../graphics/mng/buildlink3.mk"
-PRINT_PLIST_AWK+=       { if (/file-mng/) $$0 = "$${PLIST.mng}" $$0 }
 PLIST.mng=             yes
 .endif
 
+PRINT_PLIST_AWK+=       { if (/file-xpm/) $$0 = "$${PLIST.xpm}" $$0 }
 .if !empty(PKG_OPTIONS:Mxpm)
 .include "../../x11/libXpm/buildlink3.mk"
-PRINT_PLIST_AWK+=       { if (/file-xpm/) $$0 = "$${PLIST.xpm}" $$0 }
 PLIST.xpm=             yes
 .endif