CVS commit: pkgsrc/graphics

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Tue, 14 Nov 2023 19:03:37 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 14 19:03:37 UTC 2023

Modified Files:
        pkgsrc/graphics/ImageMagick: Makefile buildlink3.mk options.mk
        pkgsrc/graphics/ImageMagick6: Makefile buildlink3.mk options.mk

Log Message:
ImageMagick: restore fontconfig and ghostscript options

While comments in the pkgsrc Makefile suggest otherwise, these options work,
and are useful for building on older systems and systems that don't use X11.


To generate a diff of this commit:
cvs rdiff -u -r1.329 -r1.330 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.107 -r1.108 pkgsrc/graphics/ImageMagick/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/ImageMagick/options.mk
cvs rdiff -u -r1.63 -r1.64 pkgsrc/graphics/ImageMagick6/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/graphics/ImageMagick6/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/ImageMagick6/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/ImageMagick/Makefile
diff -u pkgsrc/graphics/ImageMagick/Makefile:1.329 pkgsrc/graphics/ImageMagick/Makefile:1.330
--- pkgsrc/graphics/ImageMagick/Makefile:1.329  Sun Nov 12 13:21:49 2023
+++ pkgsrc/graphics/ImageMagick/Makefile        Tue Nov 14 19:03:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.329 2023/11/12 13:21:49 wiz Exp $
+# $NetBSD: Makefile,v 1.330 2023/11/14 19:03:37 nia Exp $
 
 PKGREVISION= 4
 .include "Makefile.common"
@@ -13,14 +13,10 @@ CONFLICTS=  geomview<1.8.1nb2  # used to 
 USE_LANGUAGES=         c c++ c99
 USE_TOOLS+=            gmake pkg-config:run
 CONFIGURE_ARGS+=       --disable-assert
-CONFIGURE_ARGS+=       --with-fontconfig
 CONFIGURE_ARGS+=       --with-jpeg
 CONFIGURE_ARGS+=       --with-xml=yes
 CONFIGURE_ARGS+=       --without-perl
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
-# This one used to be optional, but it depends on ghostscript even if it's
-# disabled so having a way to disable it seems pointless.
-CONFIGURE_ARGS+=       --with-gslib
 # http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25475
 CONFIGURE_ARGS.NetBSD+=        --disable-openmp
 PKGCONFIG_OVERRIDE+=   MagickWand/MagickWand.pc.in
@@ -84,15 +80,9 @@ SUBST_SED.fix-pc=    -e 's,@PKG_CONFIG@,pkg
 CTF_FILES_SKIP+=       lib/libMagickCore-7.Q16HDRI.so.*
 CTF_FILES_SKIP+=       lib/libMagickWand-7.Q16HDRI.so.*
 
-.include "../../print/ghostscript/buildlink3.mk"
-.if ${PKG_BUILD_OPTIONS.ghostscript:Mghostscript-gpl}
-CFLAGS+=               -DPKGSRC_USE_OLD_GHOSTSCRIPT
-.endif
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"

Index: pkgsrc/graphics/ImageMagick/buildlink3.mk
diff -u pkgsrc/graphics/ImageMagick/buildlink3.mk:1.107 pkgsrc/graphics/ImageMagick/buildlink3.mk:1.108
--- pkgsrc/graphics/ImageMagick/buildlink3.mk:1.107     Sun Nov 12 13:21:49 2023
+++ pkgsrc/graphics/ImageMagick/buildlink3.mk   Tue Nov 14 19:03:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.107 2023/11/12 13:21:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.108 2023/11/14 19:03:37 nia Exp $
 
 BUILDLINK_TREE+=       ImageMagick
 
@@ -19,6 +19,12 @@ pkgbase := ImageMagick
 .if ${PKG_BUILD_OPTIONS.ImageMagick:Mdjvu}
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .endif
+.if ${PKG_BUILD_OPTIONS.ImageMagick:Mfontconfig}
+.include "../../fonts/fontconfig/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.ImageMagick:Mghostscript}
+.include "../../print/ghostscript/buildlink3.mk"
+.endif
 .if ${PKG_BUILD_OPTIONS.ImageMagick:Mjp2}
 .include "../../graphics/openjpeg/buildlink3.mk"
 .endif
@@ -43,14 +49,12 @@ pkgbase := ImageMagick
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
-.include "../../print/ghostscript/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif # IMAGEMAGICK_BUILDLINK3_MK
 

Index: pkgsrc/graphics/ImageMagick/options.mk
diff -u pkgsrc/graphics/ImageMagick/options.mk:1.25 pkgsrc/graphics/ImageMagick/options.mk:1.26
--- pkgsrc/graphics/ImageMagick/options.mk:1.25 Thu Sep 29 09:21:11 2022
+++ pkgsrc/graphics/ImageMagick/options.mk      Tue Nov 14 19:03:37 2023
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.25 2022/09/29 09:21:11 nros Exp $
+# $NetBSD: options.mk,v 1.26 2023/11/14 19:03:37 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ImageMagick
-PKG_SUPPORTED_OPTIONS=         djvu doc fpx heif jp2 liblqr openexr tiff wmf x11
-PKG_SUGGESTED_OPTIONS=         doc heif jp2 liblqr tiff x11
+PKG_SUPPORTED_OPTIONS=         djvu doc fontconfig fpx ghostscript heif jp2
+PKG_SUPPORTED_OPTIONS+=                liblqr openexr tiff wmf x11
+PKG_SUGGESTED_OPTIONS=         doc fontconfig ghostscript heif jp2 liblqr tiff x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,6 +15,23 @@ PLIST_SRC+=          PLIST.doc
 CONFIGURE_ARGS+=       --disable-docs
 .endif
 
+.if !empty(PKG_OPTIONS:Mfontconfig)
+CONFIGURE_ARGS+=       --with-fontconfig
+.include "../../fonts/fontconfig/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-fontconfig
+.endif
+
+.if !empty(PKG_OPTIONS:Mghostscript)
+CONFIGURE_ARGS+=       --with-gslib
+.include "../../print/ghostscript/buildlink3.mk"
+.  if ${PKG_BUILD_OPTIONS.ghostscript:Mghostscript-gpl}
+CFLAGS+=               -DPKGSRC_USE_OLD_GHOSTSCRIPT
+.  endif
+.else
+CONFIGURE_ARGS+=       --without-gslib
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"

Index: pkgsrc/graphics/ImageMagick6/Makefile
diff -u pkgsrc/graphics/ImageMagick6/Makefile:1.63 pkgsrc/graphics/ImageMagick6/Makefile:1.64
--- pkgsrc/graphics/ImageMagick6/Makefile:1.63  Tue Nov 14 14:01:57 2023
+++ pkgsrc/graphics/ImageMagick6/Makefile       Tue Nov 14 19:03:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2023/11/14 14:01:57 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2023/11/14 19:03:37 nia Exp $
 
 PKGREVISION= 5
 .include "Makefile.common"
@@ -13,14 +13,10 @@ CONFLICTS=  geomview<1.8.1nb2  # used to 
 USE_LANGUAGES=         c c++ c99
 USE_TOOLS+=            gmake pkg-config:run
 CONFIGURE_ARGS+=       --disable-assert
-CONFIGURE_ARGS+=       --with-fontconfig
 CONFIGURE_ARGS+=       --with-xml=yes
 CONFIGURE_ARGS+=       --without-perl
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=       --program-suffix=6
-# This one used to be optional, but it depends on ghostscript even if it's
-# disabled so having a way to disable it seems pointless.
-CONFIGURE_ARGS+=       --with-gslib
 # http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25475
 CONFIGURE_ARGS.NetBSD+=        --disable-openmp
 PKGCONFIG_OVERRIDE=    Magick++/lib/ImageMagick++.pc.in
@@ -107,13 +103,11 @@ CTF_FILES_SKIP+=  lib/libMagickCore-6.Q16
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
-.include "../../print/ghostscript/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/ImageMagick6/buildlink3.mk
diff -u pkgsrc/graphics/ImageMagick6/buildlink3.mk:1.41 pkgsrc/graphics/ImageMagick6/buildlink3.mk:1.42
--- pkgsrc/graphics/ImageMagick6/buildlink3.mk:1.41     Sun Nov 12 13:21:49 2023
+++ pkgsrc/graphics/ImageMagick6/buildlink3.mk  Tue Nov 14 19:03:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2023/11/12 13:21:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2023/11/14 19:03:37 nia Exp $
 
 BUILDLINK_TREE+=       ImageMagick6
 
@@ -14,6 +14,12 @@ pkgbase := ImageMagick6
 .if ${PKG_BUILD_OPTIONS.ImageMagick6:Mdjvu}
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .endif
+.if ${PKG_BUILD_OPTIONS.ImageMagick6:Mfontconfig}
+.include "../../fonts/fontconfig/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.ImageMagick6:Mghostscript}
+.include "../../fonts/ghostscript/buildlink3.mk"
+.endif
 .if ${PKG_BUILD_OPTIONS.ImageMagick6:Mjp2}
 .include "../../graphics/openjpeg/buildlink3.mk"
 .endif
@@ -48,14 +54,12 @@ ImageMagick6-preconfigure:
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
-.include "../../print/ghostscript/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif # IMAGEMAGICK6_BUILDLINK3_MK
 

Index: pkgsrc/graphics/ImageMagick6/options.mk
diff -u pkgsrc/graphics/ImageMagick6/options.mk:1.5 pkgsrc/graphics/ImageMagick6/options.mk:1.6
--- pkgsrc/graphics/ImageMagick6/options.mk:1.5 Thu Sep 29 09:21:11 2022
+++ pkgsrc/graphics/ImageMagick6/options.mk     Tue Nov 14 19:03:37 2023
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.5 2022/09/29 09:21:11 nros Exp $
+# $NetBSD: options.mk,v 1.6 2023/11/14 19:03:37 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ImageMagick
-PKG_SUPPORTED_OPTIONS=         doc x11 jp2 djvu openexr wmf fpx
-PKG_SUGGESTED_OPTIONS=         doc x11 jp2
+PKG_SUPPORTED_OPTIONS=         doc fontconfig ghostscript x11 jp2 djvu openexr
+PKG_SUPPORTED_OPTIONS+=                wmf fpx
+PKG_SUGGESTED_OPTIONS=         doc fontconfig ghostscript x11 jp2
 PKG_OPTIONS_LEGACY_OPTS+=      jasper:jp2
 
 .include "../../mk/bsd.options.mk"
@@ -15,6 +16,20 @@ PLIST_SRC+=          PLIST.doc
 CONFIGURE_ARGS+=       --disable-docs
 .endif
 
+.if !empty(PKG_OPTIONS:Mfontconfig)
+CONFIGURE_ARGS+=       --with-fontconfig
+.include "../../fonts/fontconfig/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-fontconfig
+.endif
+
+.if !empty(PKG_OPTIONS:Mghostscript)
+CONFIGURE_ARGS+=       --with-gslib
+.include "../../print/ghostscript/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-gslib
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"

Prev by Date: CVS commit: pkgsrc/graphics/ImageMagick
Next by Date: CVS commit: pkgsrc/chat/matterircd
Previous by Thread: CVS commit: pkgsrc/graphics/ImageMagick
Next by Thread: CVS commit: pkgsrc/chat/matterircd
Indexes:

Home | Main Index | Thread Index | Old Index