diff options
author | pat <pat@FreeBSD.org> | 2002-03-07 10:40:05 +0800 |
---|---|---|
committer | pat <pat@FreeBSD.org> | 2002-03-07 10:40:05 +0800 |
commit | 06117e7fe45884afa73c88b7dd07f405b5fa4763 (patch) | |
tree | 49ca01fd44cddaf7643fc715f0a95382edca2acc /graphics | |
parent | 666c237a8487e30457cc02a2c544738de81df737 (diff) | |
download | freebsd-ports-gnome-06117e7fe45884afa73c88b7dd07f405b5fa4763.tar.gz freebsd-ports-gnome-06117e7fe45884afa73c88b7dd07f405b5fa4763.tar.zst freebsd-ports-gnome-06117e7fe45884afa73c88b7dd07f405b5fa4763.zip |
- Update to 5.4.3.11
- Dont remove .la files
PR: 35614
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/ImageMagick/Makefile | 33 | ||||
-rw-r--r-- | graphics/ImageMagick/distinfo | 2 | ||||
-rw-r--r-- | graphics/ImageMagick/files/patch-an | 14 | ||||
-rw-r--r-- | graphics/ImageMagick/pkg-plist | 112 |
4 files changed, 114 insertions, 47 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 27aee3fe2078..3888aa1e1e65 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ImageMagick -PORTVERSION= 5.4.3.10 +PORTVERSION= 5.4.3.11 CATEGORIES= graphics perl5 MASTER_SITES= http://imagemagick.sourceforge.net/http/ \ ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \ @@ -46,15 +46,12 @@ LIB_DEPENDS+= bz2:${PORTSDIR}/archivers/bzip2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} USE_PERL5= yes -GNU_CONFIGURE= yes USE_GMAKE= yes +GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-shared --with-perl=${PERL5} \ --without-gslib --without-jp2 -.ifndef WITH_HDF -CONFIGURE_ARGS+=--without-hdf -.endif INSTALLS_SHLIB= yes MAN1= ImageMagick.1 Magick++-config.1 Magick-config.1 \ @@ -97,6 +94,12 @@ PLIST_SUB+= MODULES='' PLIST_SUB+= MODULES='@comment ' .endif +.if defined(WITH_HDF) +CONFIGURE_ARGS+= --with-hdf +.else +CONFIGURE_ARGS+= --without-hdf +.endif + .if defined(WITHOUT_X11) PKGNAMESUFFIX+= -nox11 BUILD_DEPENDS+= gs:${PORTSDIR}/print/ghostscript-gnu-nox11 @@ -113,25 +116,25 @@ MAN1+= animate.1 display.1 import.1 PLIST_SUB+= X11='' .endif +.if defined(NOPORTDOCS) +INSTALL_TARGET= install +.else +INSTALL_TARGET= install install-data-html +.endif + pre-patch: @${PERL} -pi -e 's|-lpthread|-lc_r|g ; \ s|LIBLTDL=.*$$|LIBLTDL="-lltdl"|g ; \ s|INCLTDL=.*$$|INCLTDL=|g ; \ s|lcms/lcms.h|lcms.h|g ; \ s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|top_builddir\)/ltdl/libltdlc.la|LIBLTDL\)|g' + @find ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \ + 's|top_builddir\)/ltdl/libltdlc.la|LIBLTDL\)|g ; \ + s|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \ + s| install-data-html||g' @${PERL} -pi -e 's|lcms/lcms.h|lcms.h|g' ${WRKSRC}/magick/transform.c @${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c @${PERL} -pi -e 's|timestamp: %ld|timestamp: %d|g' \ ${WRKSRC}/magick/xwindow.c - @${PERL} -pi -e 's|pkgdocdir = (.+)|pkgdocdir = ${DOCSDIR}/|' \ - ${WRKSRC}/Makefile.in - -.if defined(NOPORTDOCS) -pre-install: -# Don't install the HTML documentation... - ${TOUCH} ${WRKSRC}/install-data-html -.endif .include <bsd.port.mk> diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 391fbd81d21e..ffda98496cf1 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1 +1 @@ -MD5 (ImageMagick-5.4.3-10.tar.gz) = 5d27f149744ce8d63f563e509a676b0b +MD5 (ImageMagick-5.4.3-11.tar.gz) = a38e6d6f5ab76a789977915c248b809d diff --git a/graphics/ImageMagick/files/patch-an b/graphics/ImageMagick/files/patch-an index 4bb49a8a9983..1ec3082acd8e 100644 --- a/graphics/ImageMagick/files/patch-an +++ b/graphics/ImageMagick/files/patch-an @@ -8,17 +8,3 @@ avoid_version=yes continue ;; -@@ -4730,11 +4732,13 @@ - IFS="$save_ifs" - fi - -+ if /usr/bin/false; then - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist index 5daba2e9521a..9c9527cdb7b3 100644 --- a/graphics/ImageMagick/pkg-plist +++ b/graphics/ImageMagick/pkg-plist @@ -53,104 +53,195 @@ include/magick/version.h include/magick/widget.h include/magick/xwindow.h lib/ImageMagick/delegates.mgk -lib/ImageMagick/type-ghostscript.mgk -lib/ImageMagick/type-solaris.mgk -lib/ImageMagick/type-windows.mgk +%%MODULES%%lib/ImageMagick/modules/coders/art.la %%MODULES%%lib/ImageMagick/modules/coders/art.so +%%MODULES%%lib/ImageMagick/modules/coders/avi.la %%MODULES%%lib/ImageMagick/modules/coders/avi.so +%%MODULES%%lib/ImageMagick/modules/coders/avs.la %%MODULES%%lib/ImageMagick/modules/coders/avs.so +%%MODULES%%lib/ImageMagick/modules/coders/bmp.la %%MODULES%%lib/ImageMagick/modules/coders/bmp.so +%%MODULES%%lib/ImageMagick/modules/coders/caption.la %%MODULES%%lib/ImageMagick/modules/coders/caption.so +%%MODULES%%lib/ImageMagick/modules/coders/cmyk.la %%MODULES%%lib/ImageMagick/modules/coders/cmyk.so +%%MODULES%%lib/ImageMagick/modules/coders/cut.la %%MODULES%%lib/ImageMagick/modules/coders/cut.so +%%MODULES%%lib/ImageMagick/modules/coders/dcm.la %%MODULES%%lib/ImageMagick/modules/coders/dcm.so +%%MODULES%%lib/ImageMagick/modules/coders/dib.la %%MODULES%%lib/ImageMagick/modules/coders/dib.so +%%MODULES%%lib/ImageMagick/modules/coders/dps.la %%MODULES%%lib/ImageMagick/modules/coders/dps.so +%%MODULES%%lib/ImageMagick/modules/coders/dpx.la %%MODULES%%lib/ImageMagick/modules/coders/dpx.so +%%MODULES%%lib/ImageMagick/modules/coders/ept.la %%MODULES%%lib/ImageMagick/modules/coders/ept.so +%%MODULES%%lib/ImageMagick/modules/coders/fax.la %%MODULES%%lib/ImageMagick/modules/coders/fax.so +%%MODULES%%lib/ImageMagick/modules/coders/fits.la %%MODULES%%lib/ImageMagick/modules/coders/fits.so +%%MODULES%%lib/ImageMagick/modules/coders/fpx.la %%MODULES%%lib/ImageMagick/modules/coders/fpx.so +%%MODULES%%lib/ImageMagick/modules/coders/gif.la %%MODULES%%lib/ImageMagick/modules/coders/gif.so +%%MODULES%%lib/ImageMagick/modules/coders/gradient.la %%MODULES%%lib/ImageMagick/modules/coders/gradient.so +%%MODULES%%lib/ImageMagick/modules/coders/gray.la %%MODULES%%lib/ImageMagick/modules/coders/gray.so +%%MODULES%%lib/ImageMagick/modules/coders/hdf.la %%MODULES%%lib/ImageMagick/modules/coders/hdf.so +%%MODULES%%lib/ImageMagick/modules/coders/histogram.la %%MODULES%%lib/ImageMagick/modules/coders/histogram.so +%%MODULES%%lib/ImageMagick/modules/coders/html.la %%MODULES%%lib/ImageMagick/modules/coders/html.so +%%MODULES%%lib/ImageMagick/modules/coders/icon.la %%MODULES%%lib/ImageMagick/modules/coders/icon.so +%%MODULES%%lib/ImageMagick/modules/coders/jbig.la %%MODULES%%lib/ImageMagick/modules/coders/jbig.so +%%MODULES%%lib/ImageMagick/modules/coders/jp2.la %%MODULES%%lib/ImageMagick/modules/coders/jp2.so +%%MODULES%%lib/ImageMagick/modules/coders/jpeg.la %%MODULES%%lib/ImageMagick/modules/coders/jpeg.so +%%MODULES%%lib/ImageMagick/modules/coders/label.la %%MODULES%%lib/ImageMagick/modules/coders/label.so +%%MODULES%%lib/ImageMagick/modules/coders/logo.la %%MODULES%%lib/ImageMagick/modules/coders/logo.so +%%MODULES%%lib/ImageMagick/modules/coders/map.la %%MODULES%%lib/ImageMagick/modules/coders/map.so +%%MODULES%%lib/ImageMagick/modules/coders/mat.la %%MODULES%%lib/ImageMagick/modules/coders/mat.so +%%MODULES%%lib/ImageMagick/modules/coders/matte.la %%MODULES%%lib/ImageMagick/modules/coders/matte.so +%%MODULES%%lib/ImageMagick/modules/coders/meta.la %%MODULES%%lib/ImageMagick/modules/coders/meta.so +%%MODULES%%lib/ImageMagick/modules/coders/miff.la %%MODULES%%lib/ImageMagick/modules/coders/miff.so %%MODULES%%lib/ImageMagick/modules/coders/modules.mgk +%%MODULES%%lib/ImageMagick/modules/coders/mono.la %%MODULES%%lib/ImageMagick/modules/coders/mono.so +%%MODULES%%lib/ImageMagick/modules/coders/mpc.la %%MODULES%%lib/ImageMagick/modules/coders/mpc.so +%%MODULES%%lib/ImageMagick/modules/coders/mpeg.la %%MODULES%%lib/ImageMagick/modules/coders/mpeg.so +%%MODULES%%lib/ImageMagick/modules/coders/mpr.la %%MODULES%%lib/ImageMagick/modules/coders/mpr.so +%%MODULES%%lib/ImageMagick/modules/coders/msl.la %%MODULES%%lib/ImageMagick/modules/coders/msl.so +%%MODULES%%lib/ImageMagick/modules/coders/mtv.la %%MODULES%%lib/ImageMagick/modules/coders/mtv.so +%%MODULES%%lib/ImageMagick/modules/coders/mvg.la %%MODULES%%lib/ImageMagick/modules/coders/mvg.so +%%MODULES%%lib/ImageMagick/modules/coders/null.la %%MODULES%%lib/ImageMagick/modules/coders/null.so +%%MODULES%%lib/ImageMagick/modules/coders/otb.la %%MODULES%%lib/ImageMagick/modules/coders/otb.so +%%MODULES%%lib/ImageMagick/modules/coders/palm.la %%MODULES%%lib/ImageMagick/modules/coders/palm.so +%%MODULES%%lib/ImageMagick/modules/coders/pcd.la %%MODULES%%lib/ImageMagick/modules/coders/pcd.so +%%MODULES%%lib/ImageMagick/modules/coders/pcl.la %%MODULES%%lib/ImageMagick/modules/coders/pcl.so +%%MODULES%%lib/ImageMagick/modules/coders/pcx.la %%MODULES%%lib/ImageMagick/modules/coders/pcx.so +%%MODULES%%lib/ImageMagick/modules/coders/pdb.la %%MODULES%%lib/ImageMagick/modules/coders/pdb.so +%%MODULES%%lib/ImageMagick/modules/coders/pdf.la %%MODULES%%lib/ImageMagick/modules/coders/pdf.so +%%MODULES%%lib/ImageMagick/modules/coders/pict.la %%MODULES%%lib/ImageMagick/modules/coders/pict.so +%%MODULES%%lib/ImageMagick/modules/coders/pix.la %%MODULES%%lib/ImageMagick/modules/coders/pix.so +%%MODULES%%lib/ImageMagick/modules/coders/plasma.la %%MODULES%%lib/ImageMagick/modules/coders/plasma.so +%%MODULES%%lib/ImageMagick/modules/coders/png.la %%MODULES%%lib/ImageMagick/modules/coders/png.so +%%MODULES%%lib/ImageMagick/modules/coders/pnm.la %%MODULES%%lib/ImageMagick/modules/coders/pnm.so +%%MODULES%%lib/ImageMagick/modules/coders/preview.la %%MODULES%%lib/ImageMagick/modules/coders/preview.so +%%MODULES%%lib/ImageMagick/modules/coders/ps.la %%MODULES%%lib/ImageMagick/modules/coders/ps.so +%%MODULES%%lib/ImageMagick/modules/coders/ps2.la %%MODULES%%lib/ImageMagick/modules/coders/ps2.so +%%MODULES%%lib/ImageMagick/modules/coders/ps3.la %%MODULES%%lib/ImageMagick/modules/coders/ps3.so +%%MODULES%%lib/ImageMagick/modules/coders/psd.la %%MODULES%%lib/ImageMagick/modules/coders/psd.so +%%MODULES%%lib/ImageMagick/modules/coders/pwp.la %%MODULES%%lib/ImageMagick/modules/coders/pwp.so +%%MODULES%%lib/ImageMagick/modules/coders/rgb.la %%MODULES%%lib/ImageMagick/modules/coders/rgb.so +%%MODULES%%lib/ImageMagick/modules/coders/rla.la %%MODULES%%lib/ImageMagick/modules/coders/rla.so +%%MODULES%%lib/ImageMagick/modules/coders/rle.la %%MODULES%%lib/ImageMagick/modules/coders/rle.so +%%MODULES%%lib/ImageMagick/modules/coders/sct.la %%MODULES%%lib/ImageMagick/modules/coders/sct.so +%%MODULES%%lib/ImageMagick/modules/coders/sfw.la %%MODULES%%lib/ImageMagick/modules/coders/sfw.so +%%MODULES%%lib/ImageMagick/modules/coders/sgi.la %%MODULES%%lib/ImageMagick/modules/coders/sgi.so +%%MODULES%%lib/ImageMagick/modules/coders/stegano.la %%MODULES%%lib/ImageMagick/modules/coders/stegano.so +%%MODULES%%lib/ImageMagick/modules/coders/sun.la %%MODULES%%lib/ImageMagick/modules/coders/sun.so +%%MODULES%%lib/ImageMagick/modules/coders/svg.la %%MODULES%%lib/ImageMagick/modules/coders/svg.so +%%MODULES%%lib/ImageMagick/modules/coders/tga.la %%MODULES%%lib/ImageMagick/modules/coders/tga.so +%%MODULES%%lib/ImageMagick/modules/coders/tiff.la %%MODULES%%lib/ImageMagick/modules/coders/tiff.so +%%MODULES%%lib/ImageMagick/modules/coders/tile.la %%MODULES%%lib/ImageMagick/modules/coders/tile.so +%%MODULES%%lib/ImageMagick/modules/coders/tim.la %%MODULES%%lib/ImageMagick/modules/coders/tim.so +%%MODULES%%lib/ImageMagick/modules/coders/ttf.la %%MODULES%%lib/ImageMagick/modules/coders/ttf.so +%%MODULES%%lib/ImageMagick/modules/coders/txt.la %%MODULES%%lib/ImageMagick/modules/coders/txt.so +%%MODULES%%lib/ImageMagick/modules/coders/uil.la %%MODULES%%lib/ImageMagick/modules/coders/uil.so +%%MODULES%%lib/ImageMagick/modules/coders/url.la %%MODULES%%lib/ImageMagick/modules/coders/url.so +%%MODULES%%lib/ImageMagick/modules/coders/uyvy.la %%MODULES%%lib/ImageMagick/modules/coders/uyvy.so +%%MODULES%%lib/ImageMagick/modules/coders/vicar.la %%MODULES%%lib/ImageMagick/modules/coders/vicar.so +%%MODULES%%lib/ImageMagick/modules/coders/vid.la %%MODULES%%lib/ImageMagick/modules/coders/vid.so +%%MODULES%%lib/ImageMagick/modules/coders/viff.la %%MODULES%%lib/ImageMagick/modules/coders/viff.so +%%MODULES%%lib/ImageMagick/modules/coders/wbmp.la %%MODULES%%lib/ImageMagick/modules/coders/wbmp.so +%%MODULES%%lib/ImageMagick/modules/coders/wmf.la %%MODULES%%lib/ImageMagick/modules/coders/wmf.so +%%MODULES%%lib/ImageMagick/modules/coders/wpg.la %%MODULES%%lib/ImageMagick/modules/coders/wpg.so +%%MODULES%%lib/ImageMagick/modules/coders/x.la %%MODULES%%lib/ImageMagick/modules/coders/x.so +%%MODULES%%lib/ImageMagick/modules/coders/xbm.la %%MODULES%%lib/ImageMagick/modules/coders/xbm.so +%%MODULES%%lib/ImageMagick/modules/coders/xc.la %%MODULES%%lib/ImageMagick/modules/coders/xc.so +%%MODULES%%lib/ImageMagick/modules/coders/xcf.la %%MODULES%%lib/ImageMagick/modules/coders/xcf.so +%%MODULES%%lib/ImageMagick/modules/coders/xpm.la %%MODULES%%lib/ImageMagick/modules/coders/xpm.so +%%MODULES%%lib/ImageMagick/modules/coders/xwd.la %%MODULES%%lib/ImageMagick/modules/coders/xwd.so +%%MODULES%%lib/ImageMagick/modules/coders/yuv.la %%MODULES%%lib/ImageMagick/modules/coders/yuv.so +lib/ImageMagick/type-ghostscript.mgk +lib/ImageMagick/type-solaris.mgk +lib/ImageMagick/type-windows.mgk lib/ImageMagick/type.mgk lib/libMagick++.a +lib/libMagick++.la lib/libMagick++.so lib/libMagick++.so.5 lib/libMagick.a +lib/libMagick.la lib/libMagick.so lib/libMagick.so.5 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm @@ -162,7 +253,6 @@ share/ImageMagick/Copyright.txt share/ImageMagick/QuickStart.txt share/ImageMagick/colors.mgk share/ImageMagick/magic.mgk -@dirrm share/ImageMagick %%PORTDOCS%%share/doc/ImageMagick/ImageMagick.html %%PORTDOCS%%share/doc/ImageMagick/images/appligent.jpg %%PORTDOCS%%share/doc/ImageMagick/images/authentica.jpg @@ -222,33 +312,23 @@ share/ImageMagick/magic.mgk %%PORTDOCS%%share/doc/ImageMagick/www/api/animate.html %%PORTDOCS%%share/doc/ImageMagick/www/api/annotate.html %%PORTDOCS%%share/doc/ImageMagick/www/api/attribute.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/attributes.html %%PORTDOCS%%share/doc/ImageMagick/www/api/blob.html %%PORTDOCS%%share/doc/ImageMagick/www/api/cache.html %%PORTDOCS%%share/doc/ImageMagick/www/api/cache_view.html %%PORTDOCS%%share/doc/ImageMagick/www/api/color.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/colors.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/compress.html %%PORTDOCS%%share/doc/ImageMagick/www/api/constitute.html %%PORTDOCS%%share/doc/ImageMagick/www/api/decorate.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/delegates.html %%PORTDOCS%%share/doc/ImageMagick/www/api/display.html %%PORTDOCS%%share/doc/ImageMagick/www/api/draw.html %%PORTDOCS%%share/doc/ImageMagick/www/api/effect.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/effects.html %%PORTDOCS%%share/doc/ImageMagick/www/api/enhance.html %%PORTDOCS%%share/doc/ImageMagick/www/api/error.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/gems.html %%PORTDOCS%%share/doc/ImageMagick/www/api/image.html %%PORTDOCS%%share/doc/ImageMagick/www/api/list.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/mac.html %%PORTDOCS%%share/doc/ImageMagick/www/api/magick.html %%PORTDOCS%%share/doc/ImageMagick/www/api/memory.html %%PORTDOCS%%share/doc/ImageMagick/www/api/monitor.html %%PORTDOCS%%share/doc/ImageMagick/www/api/montage.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/nt.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/pixel_cache.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/pixels.html %%PORTDOCS%%share/doc/ImageMagick/www/api/quantize.html %%PORTDOCS%%share/doc/ImageMagick/www/api/registry.html %%PORTDOCS%%share/doc/ImageMagick/www/api/segment.html @@ -269,10 +349,7 @@ share/ImageMagick/magic.mgk %%PORTDOCS%%share/doc/ImageMagick/www/api/types/ProfileInfo.html %%PORTDOCS%%share/doc/ImageMagick/www/api/types/QuantizeInfo.html %%PORTDOCS%%share/doc/ImageMagick/www/api/types/RectangleInfo.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/utility.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/vms.html %%PORTDOCS%%share/doc/ImageMagick/www/api/widget.html -%%PORTDOCS%%share/doc/ImageMagick/www/api/xwindows.html %%PORTDOCS%%share/doc/ImageMagick/www/api/zoom.html %%PORTDOCS%%share/doc/ImageMagick/www/api.html %%PORTDOCS%%share/doc/ImageMagick/www/archives.html @@ -305,6 +382,7 @@ share/ImageMagick/magic.mgk %%PORTDOCS%%@dirrm share/doc/ImageMagick/www %%PORTDOCS%%@dirrm share/doc/ImageMagick/images %%PORTDOCS%%@dirrm share/doc/ImageMagick +@dirrm share/ImageMagick @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 |