pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/graphics/ImageMagick6



Module Name:    pkgsrc
Committed By:   rodent
Date:           Sat Dec 17 00:39:17 UTC 2016

Modified Files:
        pkgsrc/graphics/ImageMagick6: Makefile

Log Message:
Make the pkg-config files and config shell scripts work again.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/ImageMagick6/Makefile

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

Modified files:

Index: pkgsrc/graphics/ImageMagick6/Makefile
diff -u pkgsrc/graphics/ImageMagick6/Makefile:1.2 pkgsrc/graphics/ImageMagick6/Makefile:1.3
--- pkgsrc/graphics/ImageMagick6/Makefile:1.2   Sat Jul  9 06:38:19 2016
+++ pkgsrc/graphics/ImageMagick6/Makefile       Sat Dec 17 00:39:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/07/09 06:38:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/12/17 00:39:17 rodent Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -31,6 +31,22 @@ PKGCONFIG_OVERRIDE+= magick/MagickCore.p
 PKGCONFIG_OVERRIDE+=   wand/MagickWand.pc.in
 PKGCONFIG_OVERRIDE+=   wand/Wand.pc.in
 
+SUBST_CLASSES+=                pkgcfg
+SUBST_FILES.pkgcfg=    ${PKGCONFIG_OVERRIDE} Magick++/bin/Magick++-config.in
+SUBST_FILES.pkgcfg+=   magick/Magick-config.in magick/MagickCore-config.in
+SUBST_FILES.pkgcfg+=   wand/MagickWand-config.in wand/Wand-config.in
+SUBST_MESSAGE.pkgcfg=  Fixing pkg-config requirements.
+SUBST_SED.pkgcfg=      -e 's|MagickCore-config |MagickCore-config6 |g'
+SUBST_SED.pkgcfg+=     -e 's|Wand-config|Wand-config6|g'
+SUBST_SED.pkgcfg+=     -e 's|s MagickWand|s MagickWand-6.Q16|g'
+SUBST_SED.pkgcfg+=     -e 's|s: MagickWand|s: MagickWand-6.Q16|g'
+SUBST_SED.pkgcfg+=     -e 's|s MagickCore|s MagickCore-6.Q16|g'
+SUBST_SED.pkgcfg+=     -e 's|s: MagickCore|s: MagickCore-6.Q16|g'
+SUBST_SED.pkgcfg+=     -e 's|Magick++-config|Magick++-config6|g'
+SUBST_SED.pkgcfg+=     -e 's|Magick-config |Magick-config6 |g'
+SUBST_SED.pkgcfg+=     -e 's|s Magick++|s Magick++-6.Q16|g'
+SUBST_STAGE.pkgcfg=    pre-configure
+
 GCC_REQD+=             2.95.3
 
 TEST_TARGET=           check



Home | Main Index | Thread Index | Old Index