Tue Aug 27 08:13:20 2013 UTC ()
Change PKG_SYSCONFSUBDIR to ImageMagick-${IM_MAJOR_LIB_VER}, as per
the upstream commit from 2013-02-26 (r11189). Fixes errors loading
the XML files located therein.


(fhajny)
diff -r1.199 -r1.200 pkgsrc/graphics/ImageMagick/Makefile
cvs diff -r1.199 -r1.200 pkgsrc/graphics/ImageMagick/Makefile (switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2013/07/06 23:26:46 1.199
+++ pkgsrc/graphics/ImageMagick/Makefile 2013/08/27 08:13:20 1.200
@@ -1,87 +1,87 @@ @@ -1,87 +1,87 @@
1# $NetBSD: Makefile,v 1.199 2013/07/06 23:26:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.200 2013/08/27 08:13:20 fhajny Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ImageMagick-${DISTVERSION} 5PKGNAME= ImageMagick-${DISTVERSION}
6 6
7MAINTAINER= adam@NetBSD.org 7MAINTAINER= adam@NetBSD.org
8COMMENT= Package for display and interactive manipulation of images 8COMMENT= Package for display and interactive manipulation of images
9 9
10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
11 11
12PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
13 13
14USE_LANGUAGES= c c++ c99 14USE_LANGUAGES= c c++ c99
15USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
16CONFIGURE_ARGS+= --disable-assert 16CONFIGURE_ARGS+= --disable-assert
17CONFIGURE_ARGS+= --with-fontconfig 17CONFIGURE_ARGS+= --with-fontconfig
18CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 18CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
19CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 19CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
20CONFIGURE_ARGS+= --with-xml=yes 20CONFIGURE_ARGS+= --with-xml=yes
21CONFIGURE_ARGS+= --without-perl 21CONFIGURE_ARGS+= --without-perl
22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
23PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in 23PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in
24PKGCONFIG_OVERRIDE+= Magick++/lib/Magick++.pc.in 24PKGCONFIG_OVERRIDE+= Magick++/lib/Magick++.pc.in
25PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in 25PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in
26PKGCONFIG_OVERRIDE+= magick/MagickCore.pc.in 26PKGCONFIG_OVERRIDE+= magick/MagickCore.pc.in
27PKGCONFIG_OVERRIDE+= wand/MagickWand.pc.in 27PKGCONFIG_OVERRIDE+= wand/MagickWand.pc.in
28PKGCONFIG_OVERRIDE+= wand/Wand.pc.in 28PKGCONFIG_OVERRIDE+= wand/Wand.pc.in
29 29
30GCC_REQD+= 2.95.3 30GCC_REQD+= 2.95.3
31 31
32PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER:Q} 32PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER:Q}
33PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER:Q} 33PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER:Q}
34 34
35TEST_TARGET= check 35TEST_TARGET= check
36 36
37.include "options.mk" 37.include "options.mk"
38 38
39.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) 39.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
40GCC_REQD+= 3.0 40GCC_REQD+= 3.0
41.endif 41.endif
42 42
43# Avoid compiler bug on "mipsel" (cobalt?) 43# Avoid compiler bug on "mipsel" (cobalt?)
44.if ${MACHINE_ARCH} == "mipsel" 44.if ${MACHINE_ARCH} == "mipsel"
45CFLAGS+= -O 45CFLAGS+= -O
46.endif 46.endif
47 47
48PKG_SYSCONFSUBDIR= ImageMagick 48PKG_SYSCONFSUBDIR= ImageMagick-${IM_MAJOR_LIB_VER}
49EGDIR= ${PREFIX}/share/examples/ImageMagick 49EGDIR= ${PREFIX}/share/examples/ImageMagick
50CONF_FILES= ${EGDIR}/coder.xml ${PKG_SYSCONFDIR}/coder.xml 50CONF_FILES= ${EGDIR}/coder.xml ${PKG_SYSCONFDIR}/coder.xml
51CONF_FILES+= ${EGDIR}/colors.xml ${PKG_SYSCONFDIR}/colors.xml 51CONF_FILES+= ${EGDIR}/colors.xml ${PKG_SYSCONFDIR}/colors.xml
52CONF_FILES+= ${EGDIR}/delegates.xml ${PKG_SYSCONFDIR}/delegates.xml 52CONF_FILES+= ${EGDIR}/delegates.xml ${PKG_SYSCONFDIR}/delegates.xml
53CONF_FILES+= ${EGDIR}/log.xml ${PKG_SYSCONFDIR}/log.xml 53CONF_FILES+= ${EGDIR}/log.xml ${PKG_SYSCONFDIR}/log.xml
54CONF_FILES+= ${EGDIR}/magic.xml ${PKG_SYSCONFDIR}/magic.xml 54CONF_FILES+= ${EGDIR}/magic.xml ${PKG_SYSCONFDIR}/magic.xml
55CONF_FILES+= ${EGDIR}/mime.xml ${PKG_SYSCONFDIR}/mime.xml 55CONF_FILES+= ${EGDIR}/mime.xml ${PKG_SYSCONFDIR}/mime.xml
56CONF_FILES+= ${EGDIR}/policy.xml ${PKG_SYSCONFDIR}/policy.xml 56CONF_FILES+= ${EGDIR}/policy.xml ${PKG_SYSCONFDIR}/policy.xml
57CONF_FILES+= ${EGDIR}/thresholds.xml ${PKG_SYSCONFDIR}/thresholds.xml 57CONF_FILES+= ${EGDIR}/thresholds.xml ${PKG_SYSCONFDIR}/thresholds.xml
58CONF_FILES+= ${EGDIR}/type-dejavu.xml ${PKG_SYSCONFDIR}/type-dejavu.xml 58CONF_FILES+= ${EGDIR}/type-dejavu.xml ${PKG_SYSCONFDIR}/type-dejavu.xml
59CONF_FILES+= ${EGDIR}/type-ghostscript.xml ${PKG_SYSCONFDIR}/type-ghostscript.xml 59CONF_FILES+= ${EGDIR}/type-ghostscript.xml ${PKG_SYSCONFDIR}/type-ghostscript.xml
60CONF_FILES+= ${EGDIR}/type-windows.xml ${PKG_SYSCONFDIR}/type-windows.xml 60CONF_FILES+= ${EGDIR}/type-windows.xml ${PKG_SYSCONFDIR}/type-windows.xml
61CONF_FILES+= ${EGDIR}/type.xml ${PKG_SYSCONFDIR}/type.xml 61CONF_FILES+= ${EGDIR}/type.xml ${PKG_SYSCONFDIR}/type.xml
62 62
63SUBST_CLASSES+= fix-cfg 63SUBST_CLASSES+= fix-cfg
64SUBST_STAGE.fix-cfg= pre-configure 64SUBST_STAGE.fix-cfg= pre-configure
65SUBST_MESSAGE.fix-cfg= Fixing configure.xml. 65SUBST_MESSAGE.fix-cfg= Fixing configure.xml.
66SUBST_FILES.fix-cfg= config/configure.xml.in 66SUBST_FILES.fix-cfg= config/configure.xml.in
67SUBST_VARS.fix-cfg= CONFIGURE_ARGS 67SUBST_VARS.fix-cfg= CONFIGURE_ARGS
68 68
69SUBST_CLASSES+= fix-etc 69SUBST_CLASSES+= fix-etc
70SUBST_STAGE.fix-etc= pre-configure 70SUBST_STAGE.fix-etc= pre-configure
71SUBST_MESSAGE.fix-etc= Handle configuration files. 71SUBST_MESSAGE.fix-etc= Handle configuration files.
72SUBST_FILES.fix-etc= Makefile.in 72SUBST_FILES.fix-etc= Makefile.in
73SUBST_SED.fix-etc= -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ImageMagick,' 73SUBST_SED.fix-etc= -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ImageMagick,'
74 74
75.include "../../archivers/bzip2/buildlink3.mk" 75.include "../../archivers/bzip2/buildlink3.mk"
76.include "../../archivers/xz/buildlink3.mk" 76.include "../../archivers/xz/buildlink3.mk"
77.include "../../devel/libltdl/buildlink3.mk" 77.include "../../devel/libltdl/buildlink3.mk"
78.include "../../fonts/fontconfig/buildlink3.mk" 78.include "../../fonts/fontconfig/buildlink3.mk"
79.include "../../graphics/freetype2/buildlink3.mk" 79.include "../../graphics/freetype2/buildlink3.mk"
80.include "../../graphics/lcms2/buildlink3.mk" 80.include "../../graphics/lcms2/buildlink3.mk"
81.include "../../graphics/openexr/buildlink3.mk" 81.include "../../graphics/openexr/buildlink3.mk"
82.include "../../graphics/libwebp/buildlink3.mk" 82.include "../../graphics/libwebp/buildlink3.mk"
83.include "../../graphics/png/buildlink3.mk" 83.include "../../graphics/png/buildlink3.mk"
84.include "../../graphics/tiff/buildlink3.mk" 84.include "../../graphics/tiff/buildlink3.mk"
85.include "../../math/fftw/buildlink3.mk" 85.include "../../math/fftw/buildlink3.mk"
86.include "../../textproc/libxml2/buildlink3.mk" 86.include "../../textproc/libxml2/buildlink3.mk"
87.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"