From de83520289385d8b93b2fa7f14184ad3b71c5e76 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Sun, 5 Mar 2000 15:38:27 +0000 Subject: [PATCH] Integrate parts of PR 16864: HDF support, XLIB, PLIST's ldconfig Add BZLIB support PR: 16864 Submitted by: KATO Tsuguru Approved by: asami --- graphics/ImageMagick/Makefile | 9 +++++++-- graphics/ImageMagick/pkg-plist | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 0a2d53be248b..e808474912e7 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -18,16 +18,20 @@ MASTER_SITES= ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \ MAINTAINER= jseger@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ + df.1:${PORTSDIR}/graphics/hdf \ tiff.4:${PORTSDIR}/graphics/tiff \ png.3:${PORTSDIR}/graphics/png \ jbig.1:${PORTSDIR}/graphics/jbigkit \ ttf.4:${PORTSDIR}/print/freetype -BUILD_DEPENDS= fig2dev:${PORTSDIR}/print/transfig \ +# bzip2 for bzlib +BUILD_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2 \ + fig2dev:${PORTSDIR}/print/transfig \ picttoppm:${PORTSDIR}/graphics/netpbm \ mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \ gs:${PORTSDIR}/print/ghostscript55 -MAN1= ImageMagick.1 animate.1 combine.1 convert.1 display.1 identify.1 import.1 mogrify.1 montage.1 +MAN1= ImageMagick.1 animate.1 combine.1 convert.1 display.1 identify.1 \ + import.1 mogrify.1 montage.1 MAN3= Image::Magick.3 MAN4= miff.4 MAN5= quantize.5 @@ -40,6 +44,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --enable-shared --with-perl=${PERL5} \ CONFIGURE_ARGS+= --enable-lzw .endif USE_PERL5= YES +USE_XLIB= YES CONFIGURE_ENV= LDFLAGS="$(LDFLAGS) -L${WRKSRC}/magick/.libs" post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist index f91d23ba8e66..ac6965731ddc 100644 --- a/graphics/ImageMagick/pkg-plist +++ b/graphics/ImageMagick/pkg-plist @@ -30,14 +30,14 @@ lib/libMagick.a lib/libMagick.la lib/libMagick.so lib/libMagick.so.5 +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix share/ImageMagick/delegates.mgk -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image