diff options
| author | jlam <jlam> | 2002-08-25 19:21:43 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 19:21:43 +0000 |
| commit | 3d80364aa7d569b8fa9e6f1069f1c94550179218 (patch) | |
| tree | c69c41be2f3b44bedceeee7e348c2ae58c476c6a /graphics/ImageMagick | |
| parent | 3bff324aa681cfea59a4a20f4bdd9520a4707593 (diff) | |
| download | pkgsrc-3d80364aa7d569b8fa9e6f1069f1c94550179218.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.
Diffstat (limited to 'graphics/ImageMagick')
| -rw-r--r-- | graphics/ImageMagick/Makefile | 2 | ||||
| -rw-r--r-- | graphics/ImageMagick/PLIST | 2 | ||||
| -rw-r--r-- | graphics/ImageMagick/buildlink2.mk | 27 | ||||
| -rw-r--r-- | graphics/ImageMagick/distinfo | 2 | ||||
| -rw-r--r-- | graphics/ImageMagick/patches/patch-aa | 2 |
5 files changed, 31 insertions, 4 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index f603f1d7f88..021e583436c 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2002/08/22 08:06:11 tron Exp $ +# $NetBSD: Makefile,v 1.84 2002/08/25 19:22:44 jlam Exp $ DISTNAME= ImageMagick-5.4.8-2 PKGNAME= ${DISTNAME:S/-2/.2/} diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST index 3ca2bd7ae1d..bfc10883585 100644 --- a/graphics/ImageMagick/PLIST +++ b/graphics/ImageMagick/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/08/22 08:06:11 tron Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:44 jlam Exp $ bin/Magick++-config bin/Magick-config bin/animate diff --git a/graphics/ImageMagick/buildlink2.mk b/graphics/ImageMagick/buildlink2.mk new file mode 100644 index 00000000000..5a7039062e4 --- /dev/null +++ b/graphics/ImageMagick/buildlink2.mk @@ -0,0 +1,27 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:44 jlam Exp $ + +.if !defined(IMAGEMAGICK_BUILDLINK2_MK) +IMAGEMAGICK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= ImageMagick +BUILDLINK_DEPENDS.ImageMagick?= ImageMagick>=5.3.9nb1 +BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick + +EVAL_PREFIX+= BUILDLINK_PREFIX.ImageMagick=ImageMagick +BUILDLINK_PREFIX.ImageMagick_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.ImageMagick= include/Magick++.h +BUILDLINK_FILES.ImageMagick+= include/Magick++/* +BUILDLINK_FILES.ImageMagick+= include/magick/* +BUILDLINK_FILES.ImageMagick+= lib/libMagick.* +BUILDLINK_FILES.ImageMagick+= lib/libMagick++.* + +.include "../../archivers/bzip2/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" + +BUILDLINK_TARGETS+= ImageMagick-buildlink + +ImageMagick-buildlink: _BUILDLINK_USE + +.endif # IMAGEMAGICK_BUILDLINK2_MK diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 4b9a5df6b14..aeac4d03018 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2002/08/22 08:06:11 tron Exp $ +$NetBSD: distinfo,v 1.9 2002/08/25 19:22:44 jlam Exp $ SHA1 (ImageMagick-5.4.8-2.tar.bz2) = 5f8149c6235ba74581c19871367c73bbb7a799b9 Size (ImageMagick-5.4.8-2.tar.bz2) = 2979552 bytes diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa index dca68308b74..910b712a2e6 100644 --- a/graphics/ImageMagick/patches/patch-aa +++ b/graphics/ImageMagick/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.18 2002/08/22 08:06:12 tron Exp $ +$NetBSD: patch-aa,v 1.19 2002/08/25 19:22:45 jlam Exp $ --- coders/fits.c.orig Sun Aug 18 03:20:46 2002 +++ coders/fits.c Tue Aug 20 08:35:05 2002 |