[Midnightbsd-cvs] mports [16471] trunk/graphics: drop kde ports
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 19 07:19:47 EDT 2014
Revision: 16471
http://svnweb.midnightbsd.org/mports/?rev=16471
Author: laffer1
Date: 2014-08-19 07:19:46 -0400 (Tue, 19 Aug 2014)
Log Message:
-----------
drop kde ports
Modified Paths:
--------------
trunk/graphics/ImageMagick/Makefile
trunk/graphics/ImageMagick/distinfo
trunk/graphics/ImageMagick/pkg-plist
trunk/graphics/Makefile
trunk/graphics/png/Makefile
Removed Paths:
-------------
trunk/graphics/ImageMagick/files/patch-magick-fourier.c
trunk/graphics/kcolorchooser/
trunk/graphics/kdegraphics4/
trunk/graphics/kdegraphics4-mobipocket/
trunk/graphics/kdegraphics4-strigi-analyzer/
trunk/graphics/kdegraphics4-svgpart/
trunk/graphics/kdegraphics4-thumbnailers/
trunk/graphics/kolourpaint/
trunk/graphics/ksaneplugin/
trunk/graphics/ksnapshot/
Modified: trunk/graphics/ImageMagick/Makefile
===================================================================
--- trunk/graphics/ImageMagick/Makefile 2014-08-19 11:17:53 UTC (rev 16470)
+++ trunk/graphics/ImageMagick/Makefile 2014-08-19 11:19:46 UTC (rev 16471)
@@ -1,28 +1,48 @@
# $MidnightBSD$
PORTNAME= ImageMagick
-DISTVERSION= 6.7.4-4
-PORTREVISION= 1
+DISTVERSION= 6.8.0-7
+PORTREVISION= 5
+PORTEPOCH= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \
+MASTER_SITES= http://www.imagemagick.org/download/ \
+ http://servingzone.com/mirrors/ImageMagick/ \
+ http://mirror.checkdomain.de/imagemagick/ \
http://image_magick.veidrodis.com/image_magick/ \
+ http://imagemagick.spd.co.il/ \
+ http://www.champground.com/imagemagick/ \
+ http://ftp.surfnet.nl/pub/ImageMagick/ \
+ http://mirror.searchdaimon.com/ImageMagick/ \
+ http://mirror.is.co.za/pub/imagemagick/ \
+ http://imagemagick.mirrorcatalogs.com/ \
+ ftp://ftp.imagemagick.org/pub/ImageMagick/ \
+ ftp://mirror.aarnet.edu.au/pub/imagemagick/ \
+ ftp://mirror.checkdomain.de/imagemagick/ \
+ ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \
+ ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/ \
+ ftp://ftp.nluug.nl/pub/ImageMagick/ \
+ ftp://mirror.searchdaimon.com/ImageMagick/ \
+ ftp://sunsite.icm.edu.pl/packages/ImageMagick/ \
+ ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/ \
ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
- ftp://ftp.nluug.nl/pub/ImageMagick/
+ ftp://ftp.is.co.za/pub/imagemagick/ \
+ ftp://ftp.fifi.org/pub/ImageMagick/
MAINTAINER= ports at MidnightBSD.org
COMMENT= Image processing tools
-LICENSE= other
+LICENSE= apache2
+
+USES= gmake pkgconfig:both pathfix perl5 shebangfix
+SHEBANG_FILES= www/source/examples.pl
USE_XZ= yes
-USE_PERL5= yes
-USE_GNOME= gnomehack pkgconfig
+USE_PERL5= run build patch
+WANT_GNOME= yes
USE_AUTOTOOLS= libltdl
# For some reason, using our libtool breaks the build into pieces:
#USE_AUTOTOOLS+= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-shared --without-dps
-USE_GMAKE= yes
-MAKE_JOBS_SAFE= yes
+CONFIGURE_ARGS= --enable-shared --without-dps --without-lcms
USE_LDCONFIG= yes
MAN1= ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \
@@ -35,52 +55,29 @@
PLIST_SUB= PORTVERSION=${PORTVERSION:R}
-OPTIONS=\
- IMAGEMAGICK_16BIT_PIXEL "16bit pixel support" on \
- IMAGEMAGICK_BZLIB "Bzlib support" on \
- IMAGEMAGICK_DJVU "DJVU format support (needs threads)" off \
- IMAGEMAGICK_DOT "GraphViz dot graphs support" off \
- IMAGEMAGICK_FFTW "Discrete Fourier Transform support" on \
- IMAGEMAGICK_FONTCONFIG "Fontconfig support" on \
- IMAGEMAGICK_FPX "FPX format support" on \
- IMAGEMAGICK_GSLIB "libgs (Postscript SHLIB) support" off \
- IMAGEMAGICK_JBIG "JBIG format support" on \
- IMAGEMAGICK_JPEG "JPG format support" on \
- IMAGEMAGICK_JPEG2000 "JPEG2000 format support" on \
- IMAGEMAGICK_LCMS2 "LCMS version 2 support" on \
- IMAGEMAGICK_LCMS "LCMS version 1 support" off \
- IMAGEMAGICK_LZMA "LZMA support" on \
- IMAGEMAGICK_LQR "Liquid Rescale support" on \
- IMAGEMAGICK_MODULES "Modules support" on \
- IMAGEMAGICK_OPENEXR "OpenEXR support (needs threads)" off \
- IMAGEMAGICK_OPENMP "OpenMP for SMP (needs threads)" off \
- IMAGEMAGICK_PANGO "Pango support" off \
- IMAGEMAGICK_PDF "PDF format support" on \
- IMAGEMAGICK_PERL "Perl support" on \
- IMAGEMAGICK_PNG "PNG format support" on \
- IMAGEMAGICK_SVG "SVG format support (requires X11)" on \
- IMAGEMAGICK_TESTS "Run bundled self-tests after build" off \
- IMAGEMAGICK_TIFF "TIFF format support" on \
- IMAGEMAGICK_TTF "Freetype support" on \
- IMAGEMAGICK_WEBP "WEBP support" on \
- IMAGEMAGICK_WMF "WMF format support" on \
- THREADS "Threads support" off
+OPTIONS_DEFINE= 16BIT_PIXEL BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \
+ GRAPHVIZ GSLIB HDRI JASPER JBIG JPEG LCMS2 LZMA LQR MODULES \
+ OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \
+ THREADS
+OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FPX FREETYPE \
+ JASPER JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \
+ TIFF WEBP WMF
+16BIT_PIXEL_DESC= 16bit pixel support
+DJVU_DESC= DJVU format support (needs THREADS)
+GSLIB_DESC= libgs (Postscript SHLIB) support
+HDRI_DESC= High dynamic range images support
+MODULES_DESC= Modules support
+TESTS_DESC= Run bundled self-tests after build
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_IMAGEMAGICK_PDF) && defined(WITH_GHOSTSCRIPT_VER) && ${WITH_GHOSTSCRIPT_VER} == "7"
-IGNORE= support for the PDF format requires ghostscript 8 and higher
+.if ${PORT_OPTIONS:MHDRI}
+CONFIGURE_ARGS+= --enable-hdri
+.else
+CONFIGURE_ARGS+= --disable-hdri
.endif
-#.if defined(WITH_IMAGEMAGICK_HDRI)
-#BROKEN= hdri support broken, disable in options
-#CONFIGURE_ARGS+= --enable-hdri
-#_NO_IMAGEMAGICK_TESTS=yes
-#.else
-CONFIGURE_ARGS+= --disable-hdri
-#.endif
-
-.if defined(WITH_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
_IMAGEMAGICK_THREADS=yes
_IMAGEMAGICK_THREADS_MSG=with threads
PERL_THREADED!= ${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac'
@@ -90,12 +87,11 @@
_IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
.endif
-.if defined(WITH_IMAGEMAGICK_PERL)
+.if ${PORT_OPTIONS:MPERL}
CONFIGURE_ARGS+= --with-perl=${PERL5}
PLIST_SUB+= WITH_PERL=''
-#MAN3= Image::Magick.3
-MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-# PerlMagick not works with threads, if perl is not threaded, and vice versa
+MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}
+# PerlMagick does not work with threads, if perl is not threaded, and vice versa
. if defined(PERL_THREADED)
_IMAGEMAGICK_THREADS_PERL_MSG=Perl is threaded
_IMAGEMAGICK_THREADS=yes
@@ -123,7 +119,7 @@
.endif
# OpenMP
-.if defined(WITH_IMAGEMAGICK_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
. if ${_IMAGEMAGICK_THREADS} == "no"
IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
. else
@@ -133,12 +129,12 @@
CONFIGURE_ARGS+= --disable-openmp
.endif
+.if ${PORT_OPTIONS:M16BIT_PIXEL}
+PLIST_SUB+= QBIT='Q16'
+.else
# Faster, but poor quality
-.if defined(WITHOUT_IMAGEMAGICK_16BIT_PIXEL)
CONFIGURE_ARGS+= --with-quantum-depth=8
PLIST_SUB+= QBIT='Q8'
-.else
-PLIST_SUB+= QBIT='Q16'
.endif
.if defined(WITH_WINDOWS_FONT_DIR)
@@ -147,7 +143,7 @@
# Loadable coders, smaller executable, but PerlMagick not really works
# ('make test' there works)
-.if defined(WITH_IMAGEMAGICK_MODULES)
+.if ${PORT_OPTIONS:MMODULES}
CONFIGURE_ARGS+= --with-modules
PLIST_SUB+= MODULES=''
.else
@@ -155,7 +151,7 @@
PLIST_SUB+= MODULES='@comment '
.endif
-.if defined(WITH_IMAGEMAGICK_OPENEXR)
+.if ${PORT_OPTIONS:MOPENEXR}
. if ${_IMAGEMAGICK_THREADS} == "no"
IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
. else
@@ -167,11 +163,11 @@
PLIST_SUB+= OPENEXR="@comment "
.endif
-.if defined(WITH_IMAGEMAGICK_DJVU)
+.if ${PORT_OPTIONS:MDJVU}
. if ${_IMAGEMAGICK_THREADS} == "no"
IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
. endif
-LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre-nox11
+LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre
PLIST_SUB+= DJVU=""
.else
CONFIGURE_ARGS+= --without-djvu
@@ -178,7 +174,7 @@
PLIST_SUB+= DJVU="@comment "
.endif
-.if !defined(WITHOUT_IMAGEMAGICK_JPEG)
+.if ${PORT_OPTIONS:MJPEG}
LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg
PLIST_SUB+= JPEG=""
.else
@@ -186,7 +182,7 @@
PLIST_SUB+= JPEG="@comment "
.endif
-.if !defined(WITHOUT_IMAGEMAGICK_PNG)
+.if ${PORT_OPTIONS:MPNG}
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
PLIST_SUB+= PNG=""
.else
@@ -194,7 +190,7 @@
PLIST_SUB+= PNG="@comment "
.endif
-.if !defined(WITHOUT_IMAGEMAGICK_TIFF)
+.if ${PORT_OPTIONS:MTIFF}
LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff
PLIST_SUB+= TIFF=""
.else
@@ -202,7 +198,7 @@
PLIST_SUB+= TIFF="@comment "
.endif
-.if defined(WITH_IMAGEMAGICK_GSLIB)
+.if ${PORT_OPTIONS:MGSLIB}
CONFIGURE_ARGS+= --with-gslib
USE_GHOSTSCRIPT= yes
.else
@@ -209,14 +205,14 @@
CONFIGURE_ARGS+= --without-gslib
.endif
-.if !defined(WITHOUT_IMAGEMAGICK_LQR)
+.if ${PORT_OPTIONS:MLQR}
CONFIGURE_ARGS+= --with-lqr
-LIB_DEPENDS+= lqr-1.3:${PORTSDIR}/graphics/liblqr-1
+LIB_DEPENDS+= lqr-1:${PORTSDIR}/graphics/liblqr-1
.else
CONFIGURE_ARGS+= --without-lqr
.endif
-.if !defined(WITHOUT_IMAGEMAGICK_FFTW)
+.if ${PORT_OPTIONS:MFFTW}
CONFIGURE_ARGS+= --with-fftw
LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3
.else
@@ -224,12 +220,12 @@
.endif
# Produce BZip compressed MIFF images
-.if defined(WITHOUT_IMAGEMAGICK_BZLIB)
+.if empty(PORT_OPTIONS:MBZIP2)
CONFIGURE_ARGS+= --without-bzlib
.endif
# FPX (FlashPIX) images
-.if !defined(WITHOUT_IMAGEMAGICK_FPX)
+.if ${PORT_OPTIONS:MFPX}
LIB_DEPENDS+= fpx.[2-9]:${PORTSDIR}/graphics/libfpx
CONFIGURE_ARGS+= --with-fpx
PLIST_SUB+= FPX=""
@@ -239,7 +235,7 @@
.endif
# JBIG images (lossless compression for bi-level images)
-.if !defined(WITHOUT_IMAGEMAGICK_JBIG)
+.if ${PORT_OPTIONS:MJBIG}
LIB_DEPENDS+= jbig:${PORTSDIR}/graphics/jbigkit
PLIST_SUB+= JBIG=""
.else
@@ -248,7 +244,7 @@
.endif
# JPEG2000 images (wavelet-based lossy compression)
-.if !defined(WITHOUT_IMAGEMAGICK_JPEG2000)
+.if ${PORT_OPTIONS:MJASPER}
LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper
PLIST_SUB+= JPEG2000=""
.else
@@ -257,7 +253,7 @@
.endif
# GraphViz dot graphs
-.if defined(WITH_IMAGEMAGICK_DOT)
+.if ${PORT_OPTIONS:MGRAPHVIZ}
LIB_DEPENDS+= gvc:${PORTSDIR}/graphics/graphviz
CFLAGS+= -I${LOCALBASE}/include/graphviz
LDFLAGS+= -L${LOCALBASE}/lib/graphviz
@@ -266,29 +262,19 @@
.endif
# LZMA support
-.if !defined(WITHOUT_IMAGEMAGICK_LZMA)
-. if (${OSVERSION} < 4000)
-LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
-. endif
-.else
+.if ! ${PORT_OPTIONS:MLZMA}
CONFIGURE_ARGS+= --without-lzma
.endif
# LCMS (Little CMS) color management version 2 and 1 (mutually exclusive)
-.if !defined(WITHOUT_IMAGEMAGICK_LCMS2)
+.if ${PORT_OPTIONS:MLCMS2}
LIB_DEPENDS+= lcms2:${PORTSDIR}/graphics/lcms2
-CONFIGURE_ARGS+= --without-lcms
.else
CONFIGURE_ARGS+= --without-lcms2
-. if !defined(WITHOUT_IMAGEMAGICK_LCMS)
-LIB_DEPENDS+= lcms:${PORTSDIR}/graphics/lcms
-. else
-CONFIGURE_ARGS+= --without-lcms
-. endif
.endif
# Freetype (TrueType Font) support
-.if !defined(WITHOUT_IMAGEMAGICK_TTF)
+.if ${PORT_OPTIONS:MFREETYPE}
LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2
USE_GHOSTSCRIPT= yes
CONFIGURE_ARGS+= --with-freetype
@@ -297,7 +283,7 @@
.endif
# Webp support
-.if !defined(WITHOUT_IMAGEMAGICK_WEBP)
+.if ${PORT_OPTIONS:MWEBP}
LIB_DEPENDS+= webp:${PORTSDIR}/graphics/webp
CONFIGURE_ARGS+= --with-webp
PLIST_SUB+= WEBP=""
@@ -307,7 +293,7 @@
.endif
# Fontconfig support
-.if !defined(WITHOUT_IMAGEMAGICK_FONTCONFIG)
+.if ${PORT_OPTIONS:MFONTCONFIG}
LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig
CONFIGURE_ARGS+= --with-fontconfig
CONFIGURE_ENV+= FONTCONFIG_CFLAGS="-I${LOCALBASE}/include" \
@@ -318,7 +304,7 @@
.endif
# WMF (Windows Meta File) images
-.if !defined(WITHOUT_IMAGEMAGICK_WMF)
+.if ${PORT_OPTIONS:MWMF}
. if !defined(WITHOUT_X11)
LIB_DEPENDS+= wmf:${PORTSDIR}/graphics/libwmf
. else
@@ -333,7 +319,7 @@
.endif
# SVG (Scalable Vector Graphics) requires both libxml2 and X11
-.if defined(WITH_IMAGEMAGICK_SVG) && !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MSVG} && !defined(WITHOUT_X11)
USE_GNOME+= libxml2
LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2
CONFIGURE_ARGS+= --with-rsvg --with-xml
@@ -344,22 +330,24 @@
.endif
# Pango support
-.if defined(WITH_IMAGEMAGICK_PANGO)
-LIB_DEPENDS+= pangocairo-1\.0.0:${PORTSDIR}/x11-toolkits/pango
+.if ${PORT_OPTIONS:MPANGO} && !defined(WITHOUT_X11)
+LIB_DEPENDS+= pangocairo-1\.0:${PORTSDIR}/x11-toolkits/pango
+PLIST_SUB+= PANGO=""
.else
CONFIGURE_ARGS+= --without-pango
+PLIST_SUB+= PANGO="@comment "
.endif
# PDF (Adobe Portable Document Format) support
-.if !defined(WITHOUT_IMAGEMAGICK_PDF)
+.if ${PORT_OPTIONS:MPDF}
USE_GHOSTSCRIPT= yes
.endif
.if defined(WITHOUT_X11)
-PKGNAMESUFFIX+= -nox11
CONFIGURE_ARGS+= --without-x
CONFLICTS+= ImageMagick-6*
PLIST_SUB+= X11='@comment '
+PKGNAMESUFFIX= -nox11
.else
CONFLICTS+= ImageMagick-nox11-6*
CONFLICTS+= display-[0-9]*
@@ -368,21 +356,16 @@
PLIST_SUB+= X11=''
.endif
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+INSTALL_TARGET= install install-docDATA install-data-html
+.else
INSTALL_TARGET= install
-.else
-INSTALL_TARGET= install install-docDATA install-data-html
.endif
# Test suite, requires installed ghostscript to pass
-.if ${ARCH} == sparc64
-_NO_IMAGEMAGICK_TESTS=yes
-.endif
-.if defined(PACKAGE_BUILDING) || defined(WITH_IMAGEMAGICK_TESTS)
-. if !defined(_NO_IMAGEMAGICK_TESTS)
+.if defined(PACKAGE_BUILDING) || ${PORT_OPTIONS:MTESTS}
USE_GHOSTSCRIPT_BUILD=yes
-. endif
.endif
post-patch:
@@ -405,7 +388,7 @@
@${PERL} -pi -e 's|^(MagickLibSubdir).*$$|\1="ImageMagick"|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${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|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c
@${PERL} -pi -e 's|timestamp: %ld|timestamp: %d|g' \
${WRKSRC}/magick/xwindow.c
.if ${_IMAGEMAGICK_THREADS} == "yes"
@@ -418,6 +401,12 @@
# deprecated gvCleanup
@${REINPLACE_CMD} -e "s|gvCleanup|gvFreeContext|g" \
${WRKSRC}/coders/dot.c
+# freetype headers are in freetype2/ nowadays
+ @${REINPLACE_CMD} -e "s|freetype/|freetype2/|g" \
+ ${WRKSRC}/configure \
+ ${WRKSRC}/coders/ttf.c \
+ ${WRKSRC}/magick/annotate.c \
+ ${WRKSRC}/www/api/MagickCore/annotate_8c.html
pre-configure:
.if defined(_IMAGEMAGICK_THREADS_PERL_MSG)
@@ -425,37 +414,28 @@
@${ECHO_CMD} NOTICE: ${_IMAGEMAGICK_THREADS_PERL_MSG}. Building ImageMagick ${_IMAGEMAGICK_THREADS_MSG}.
@${ECHO_CMD} '###################################################################'
.endif
-.if !defined(WITHOUT_IMAGEMAGICK_LCMS2) && defined(WITH_IMAGEMAGICK_LCMS)
- @${ECHO_CMD} '###################################################################'
- @${ECHO_CMD} 'WARNING: both WITH_IMAGEMAGICK_LCMS and WITH_IMAGEMAGICK LCMS2'
- @${ECHO_CMD} ' selected, LCMS2 has precedence and will be used'
- @${ECHO_CMD} '###################################################################'
-.endif
-.if defined(WITH_IMAGEMAGICK_SVG) && defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MSVG} && defined(WITHOUT_X11)
@${ECHO_CMD} NOTICE: SVG format support disabled, requires X11
.endif
-post-install:
-.if !defined(WITHOUT_IMAGEMAGICK_PERL)
- @${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
+post-install: test
+.if ${PORT_OPTIONS:MPERL}
+ @${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod
.endif
-.if defined(WITHOUT_IMAGEMAGICK_16BIT_PIXEL)
- @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/coders/.keep
- @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/filters/.keep
-.else
- @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/coders/.keep
- @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/filters/.keep
+.if ${PORT_OPTIONS:MMODULES}
+. if ${PORT_OPTIONS:M16BIT_PIXEL}
+ @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/coders/.keep
+ @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/filters/.keep
+. else
+ @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/coders/.keep
+ @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/filters/.keep
+. endif
.endif
test check:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} check
-
-.if !defined(_NO_IMAGEMAGICK_TESTS)
-regression-test: test
-. if !defined(PACKAGE_BUILDING) && defined(WITH_IMAGEMAGICK_TESTS)
-post-build: regression-test
-. endif
+.if (${PORT_OPTIONS:MTESTS} || defined(PACKAGE_BUILDING))
+ -cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} check
.endif
.include <bsd.port.post.mk>
Modified: trunk/graphics/ImageMagick/distinfo
===================================================================
--- trunk/graphics/ImageMagick/distinfo 2014-08-19 11:17:53 UTC (rev 16470)
+++ trunk/graphics/ImageMagick/distinfo 2014-08-19 11:19:46 UTC (rev 16471)
@@ -1,3 +1,2 @@
-SHA256 (ImageMagick-6.7.4-4.tar.xz) = af08ec5f1c4ac325a8e21e8269fba99beeab011949e45b1176d5d26c3e3d19fa
-RMD160 (ImageMagick-6.7.4-4.tar.xz) = 3c6881c4770ba21147ef6e148eacd01b6b656433
-SIZE (ImageMagick-6.7.4-4.tar.xz) = 7619232
+SHA256 (ImageMagick-6.8.0-7.tar.xz) = e15672c8c11148bcfcd95885e1cd7a5575d4a6984bdf0a3a1c718a2a6ad37435
+SIZE (ImageMagick-6.8.0-7.tar.xz) = 8245624
Deleted: trunk/graphics/ImageMagick/files/patch-magick-fourier.c
===================================================================
--- trunk/graphics/ImageMagick/files/patch-magick-fourier.c 2014-08-19 11:17:53 UTC (rev 16470)
+++ trunk/graphics/ImageMagick/files/patch-magick-fourier.c 2014-08-19 11:19:46 UTC (rev 16471)
@@ -1,11 +0,0 @@
---- magick/fourier.c.orig 2009-08-13 09:03:13.924505718 +0200
-+++ magick/fourier.c 2009-08-13 09:03:24.685881339 +0200
-@@ -515,7 +515,7 @@
- for (x=0L; x < (long) fourier_info->center; x++)
- {
- magnitude[i]=cabs(fourier[i]);
-- phase[i]=carg(fourier[i]);
-+ phase[i]=atan2(cimag(fourier[i]),creal(fourier[i]));
- i++;
- }
- else
Modified: trunk/graphics/ImageMagick/pkg-plist
===================================================================
--- trunk/graphics/ImageMagick/pkg-plist 2014-08-19 11:17:53 UTC (rev 16470)
+++ trunk/graphics/ImageMagick/pkg-plist 2014-08-19 11:19:46 UTC (rev 16471)
@@ -21,7 +21,7 @@
etc/ImageMagick/magic.xml
etc/ImageMagick/mime.xml
etc/ImageMagick/policy.xml
-etc/ImageMagick/sRGB.icc
+etc/ImageMagick/quantization-table.xml
etc/ImageMagick/thresholds.xml
etc/ImageMagick/type.xml
etc/ImageMagick/type-dejavu.xml
@@ -52,6 +52,7 @@
include/ImageMagick/magick/blob.h
include/ImageMagick/magick/cache.h
include/ImageMagick/magick/cache-view.h
+include/ImageMagick/magick/channel.h
include/ImageMagick/magick/client.h
include/ImageMagick/magick/cipher.h
include/ImageMagick/magick/coder.h
@@ -92,6 +93,7 @@
include/ImageMagick/magick/magick-type.h
include/ImageMagick/magick/matrix.h
include/ImageMagick/magick/memory_.h
+include/ImageMagick/magick/method-attribute.h
include/ImageMagick/magick/methods.h
include/ImageMagick/magick/mime.h
include/ImageMagick/magick/module.h
@@ -101,6 +103,7 @@
include/ImageMagick/magick/option.h
include/ImageMagick/magick/paint.h
include/ImageMagick/magick/pixel.h
+include/ImageMagick/magick/pixel-accessor.h
include/ImageMagick/magick/policy.h
include/ImageMagick/magick/prepress.h
include/ImageMagick/magick/profile.h
@@ -145,6 +148,7 @@
include/ImageMagick/wand/magick-property.h
include/ImageMagick/wand/magick_wand.h
include/ImageMagick/wand/magick-wand.h
+include/ImageMagick/wand/method-attribute.h
include/ImageMagick/wand/mogrify.h
include/ImageMagick/wand/montage.h
include/ImageMagick/wand/pixel-iterator.h
@@ -152,7 +156,7 @@
include/ImageMagick/wand/stream.h
include/ImageMagick/wand/wand-view.h
lib/ImageMagick-%%PORTVERSION%%/config/configure.xml
-lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/.keep
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/.keep
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/aai.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/aai.so
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/art.la
@@ -197,6 +201,8 @@
%%TIFF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ept.so
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fax.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fax.so
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fd.la
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fd.so
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fits.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fits.so
%%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fpx.la
@@ -227,6 +233,8 @@
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ipl.so
%%JBIG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jbig.la
%%JBIG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jbig.so
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jnx.la
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jnx.so
%%JPEG2000%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jp2.la
%%JPEG2000%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jp2.so
%%JPEG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jpeg.la
@@ -295,6 +303,8 @@
%%DJVU%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/djvu.so
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pnm.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pnm.so
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pango.la
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pango.so
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/preview.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/preview.so
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ps.la
@@ -381,21 +391,24 @@
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ycbcr.so
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/yuv.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/yuv.so
-lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/.keep
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/.keep
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.so
+%%MODULES%%@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters
+%%MODULES%%@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders
+%%MODULES%%@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%
lib/libMagick++.a
lib/libMagick++.la
lib/libMagick++.so
-lib/libMagick++.so.5
+lib/libMagick++.so.6
lib/libMagickCore.a
lib/libMagickCore.la
lib/libMagickCore.so
-lib/libMagickCore.so.5
+lib/libMagickCore.so.6
lib/libMagickWand.a
lib/libMagickWand.la
lib/libMagickWand.so
-lib/libMagickWand.so.5
+lib/libMagickWand.so.6
libdata/pkgconfig/ImageMagick++.pc
libdata/pkgconfig/Magick++.pc
libdata/pkgconfig/ImageMagick.pc
@@ -518,6 +531,7 @@
%%PORTDOCS%%%%DOCSDIR%%/images/white-highlight.png
%%PORTDOCS%%%%DOCSDIR%%/images/wizard.jpg
%%PORTDOCS%%%%DOCSDIR%%/images/wizard.png
+%%PORTDOCS%%%%DOCSDIR%%/images/ImageMagick.ico
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/www/ImageMagickObject.html
%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Blob.html
@@ -1279,6 +1293,7 @@
%%PORTDOCS%%%%DOCSDIR%%/www/api/cache-view.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/cache.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/cipher.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/channel.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/color.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/colormap.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/colorspace.html
@@ -1331,9 +1346,11 @@
%%PORTDOCS%%%%DOCSDIR%%/www/api/transform.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/version.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/wand-view.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/magick++-classes.html
%%PORTDOCS%%%%DOCSDIR%%/www/architecture.html
%%PORTDOCS%%%%DOCSDIR%%/www/binary-releases.html
%%PORTDOCS%%%%DOCSDIR%%/www/changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/www/channel.html
%%PORTDOCS%%%%DOCSDIR%%/www/cipher.html
%%PORTDOCS%%%%DOCSDIR%%/www/color.html
%%PORTDOCS%%%%DOCSDIR%%/www/command-line-options.html
@@ -1422,11 +1439,8 @@
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick
%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Image
- at dirrm lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters
- at dirrm lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders
- at dirrm lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%
- at dirrm lib/ImageMagick-%%PORTVERSION%%/config
- at dirrm lib/ImageMagick-%%PORTVERSION%%
+ at dirrmtry lib/ImageMagick-%%PORTVERSION%%/config
+ at dirrmtry lib/ImageMagick-%%PORTVERSION%%
@dirrm include/ImageMagick/wand
@dirrm include/ImageMagick/magick
@dirrm include/ImageMagick/Magick++
Modified: trunk/graphics/Makefile
===================================================================
--- trunk/graphics/Makefile 2014-08-19 11:17:53 UTC (rev 16470)
+++ trunk/graphics/Makefile 2014-08-19 11:19:46 UTC (rev 16471)
@@ -57,14 +57,6 @@
SUBDIR += jbigkit
SUBDIR += jpeg
SUBDIR += kamera-kde4
-SUBDIR += kcolorchooser
-SUBDIR += kdegraphics4
-SUBDIR += kdegraphics4-mobipocket
-SUBDIR += kdegraphics4-strigi-analyzer
-SUBDIR += kdegraphics4-svgpart
-SUBDIR += kdegraphics4-thumbnailers
-SUBDIR += kolourpaint
-SUBDIR += ksaneplugin
SUBDIR += laternamagica
SUBDIR += lcms
SUBDIR += lcms2
Modified: trunk/graphics/png/Makefile
===================================================================
--- trunk/graphics/png/Makefile 2014-08-19 11:17:53 UTC (rev 16470)
+++ trunk/graphics/png/Makefile 2014-08-19 11:19:46 UTC (rev 16471)
@@ -2,8 +2,9 @@
PORTNAME= png
PORTVERSION= 1.5.18
+PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}15/${PORTVERSION}
+MASTER_SITES= http://sourceforge.net/projects/libpng/files/libpng15/1.5.18/libpng-1.5.18.tar.xz/download
DISTNAME= lib${PORTNAME}-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
More information about the Midnightbsd-cvs
mailing list