diff options
| author | adam <adam@pkgsrc.org> | 2018-11-22 16:09:23 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2018-11-22 16:09:23 +0000 |
| commit | b9de6567b1b891112f903160412059c5515bd4ef (patch) | |
| tree | 2f6ee7200555834dc04349e27538ac8ceda47c67 /graphics | |
| parent | d8ce7c135b64c633f0008a6e2bce6c77db38b342 (diff) | |
| download | pkgsrc-b9de6567b1b891112f903160412059c5515bd4ef.tar.gz | |
GraphicsMagick: commit missing patch, fix buildlink.mk
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/GraphicsMagick/Makefile | 4 | ||||
| -rw-r--r-- | graphics/GraphicsMagick/buildlink3.mk | 9 | ||||
| -rw-r--r-- | graphics/GraphicsMagick/patches/patch-configure | 16 |
3 files changed, 19 insertions, 10 deletions
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index bcb98195990..b4206febf3a 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2018/11/22 15:51:45 prlw1 Exp $ +# $NetBSD: Makefile,v 1.94 2018/11/22 16:09:23 adam Exp $ .include "Makefile.common" @@ -25,8 +25,6 @@ PKGCONFIG_OVERRIDE+= magick/GraphicsMagick.pc.in PKGCONFIG_OVERRIDE+= wand/GraphicsMagickWand.pc.in PKGCONFIG_OVERRIDE+= Magick++/lib/GraphicsMagick++.pc.in -CHECK_WRKREF_SKIP= ${PREFIX}/lib/libGraphicsMagick.* - TEST_TARGET= check .include "options.mk" diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk index b3c0cec030f..876c80b1bef 100644 --- a/graphics/GraphicsMagick/buildlink3.mk +++ b/graphics/GraphicsMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.42 2018/11/14 22:21:34 kleink Exp $ +# $NetBSD: buildlink3.mk,v 1.43 2018/11/22 16:09:23 adam Exp $ BUILDLINK_TREE+= GraphicsMagick @@ -21,14 +21,9 @@ pkgbase := GraphicsMagick .include "../../x11/libXext/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mbzip2) .include "../../archivers/bzip2/buildlink3.mk" -.endif - -.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mlzma) .include "../../archivers/xz/buildlink3.mk" -.endif - +.include "../../archivers/zstd/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/graphics/GraphicsMagick/patches/patch-configure b/graphics/GraphicsMagick/patches/patch-configure new file mode 100644 index 00000000000..815ebd3f368 --- /dev/null +++ b/graphics/GraphicsMagick/patches/patch-configure @@ -0,0 +1,16 @@ +$NetBSD: patch-configure,v 1.3 2018/11/22 16:09:23 adam Exp $ + +Do not save configure args; they reference workdir. + +--- configure.orig 2018-11-20 10:05:54.000000000 +0000 ++++ configure +@@ -30127,9 +30127,6 @@ MAGICK_API_LIBS=`echo $MAGICK_API_LIBS | + + # Save configure/build parameters for later reference + +-cat >>confdefs.h <<_ACEOF +-#define GM_BUILD_CONFIGURE_ARGS "$0 ${ac_configure_args}" +-_ACEOF + + + cat >>confdefs.h <<_ACEOF |