diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /graphics | |
| parent | - Allow for larger database UIDs (diff) | |
- update png to 1.5.10
Diffstat (limited to '')
599 files changed, 2716 insertions, 708 deletions
diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile index 444d5e7bc6bd..619c74f17b53 100644 --- a/graphics/Coin/Makefile +++ b/graphics/Coin/Makefile @@ -7,7 +7,7 @@ PORTNAME= Coin PORTVERSION= 3.1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ \ ftp://ftp.coin3d.org/pub/coin/src/all/ diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile index 09251677ef90..629e120facdf 100644 --- a/graphics/EZWGL/Makefile +++ b/graphics/EZWGL/Makefile @@ -7,7 +7,7 @@ PORTNAME= EZWGL PORTVERSION= 1.50 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics devel MASTER_SITES= ftp://ftp.ma.utexas.edu/pub/mzou/ DISTFILES= ${DISTNAME}-demo.tgz ${DISTNAME}-doc.tgz ${DISTNAME}-src.tgz @@ -16,13 +16,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The EZ Widget and Graphics Library LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_XORG= x11 xext USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken .include <bsd.port.pre.mk> diff --git a/graphics/EZWGL/files/patch-EZ_Png.c b/graphics/EZWGL/files/patch-EZ_Png.c new file mode 100644 index 000000000000..2cbe00f9e1ab --- /dev/null +++ b/graphics/EZWGL/files/patch-EZ_Png.c @@ -0,0 +1,19 @@ +--- lib/EZ_Png.c.orig 1999-12-03 22:49:22.000000000 +0100 ++++ lib/EZ_Png.c 2012-04-27 07:56:25.000000000 +0200 +@@ -37,6 +37,7 @@ + #if defined(HAVE_LIBPNG) && defined(PNG_SUPPORT) + #undef EXTERN + #include <png.h> ++#include <pngpriv.h> + + static int EZ_ReadPng(fname, w_ret, h_ret, p_ret, rgb_return) + char *fname; +@@ -61,7 +62,7 @@ + fclose(fp); + return(0); + } +- if(setjmp(png_ptr->jmpbuf)) ++ if(setjmp(png_jmpbuf(png_ptr))) + { + fclose(fp); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 82145a91ad1e..8f4415a2f6ac 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -7,7 +7,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.1.15 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SF \ @@ -22,9 +22,10 @@ CONFLICTS= GraphicsMagick-1.[23].* LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ fpx.[2-9]:${PORTSDIR}/graphics/libfpx \ jbig:${PORTSDIR}/graphics/jbigkit \ + png15:${PORTSDIR}/graphics/png \ wmflite:${PORTSDIR}/graphics/libwmf \ xml2:${PORTSDIR}/textproc/libxml2 -OTHERGRAPHICS= jasper jpeg lcms png tiff +OTHERGRAPHICS= jasper jpeg lcms tiff LIB_DEPENDS+= ${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|} OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \ @@ -56,6 +57,7 @@ USE_LDCONFIG= yes ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` CFLAGS+= -DPNG_DEPSTRUCT= +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/GraphicsMagick/files/patch-coders__png.c b/graphics/GraphicsMagick/files/patch-coders__png.c index 49c65302d833..ff6d44b05c8c 100644 --- a/graphics/GraphicsMagick/files/patch-coders__png.c +++ b/graphics/GraphicsMagick/files/patch-coders__png.c @@ -1,6 +1,32 @@ --- coders/png.c.orig 2008-01-18 00:34:17.000000000 +0100 -+++ coders/png.c 2010-03-28 19:51:04.000000000 +0200 -@@ -2038,10 +2038,10 @@ ++++ coders/png.c 2012-04-29 07:23:05.000000000 +0200 +@@ -73,6 +73,7 @@ + #if defined(HasPNG) + #include "png.h" + #include "zlib.h" ++#include "pngpriv.h" + + #if PNG_LIBPNG_VER > 95 + /* +@@ -1365,7 +1366,7 @@ + " libpng-%.1024s error: %.1024s", PNG_LIBPNG_VER_STRING, + message); + (void) ThrowException2(&image->exception,CoderError,message,image->filename); +- longjmp(ping->jmpbuf,1); ++ longjmp(png_jmpbuf(ping),1); + } + + static void PNGWarningHandler(png_struct *ping,png_const_charp message) +@@ -1660,7 +1661,7 @@ + ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image) + } + png_pixels=(unsigned char *) NULL; +- if (setjmp(ping->jmpbuf)) ++ if (setjmp(png_jmpbuf(ping))) + { + /* + PNG image is corrupt. +@@ -2038,10 +2039,10 @@ /* Image has a transparent background. */ @@ -15,7 +41,7 @@ if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) { transparent_color.red=transparent_color.opacity; -@@ -2547,7 +2547,7 @@ +@@ -2547,7 +2548,7 @@ index=indexes[x]; if (index < ping_info->num_trans) q->opacity= @@ -24,7 +50,16 @@ q++; } else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -@@ -6229,12 +6229,12 @@ +@@ -6030,7 +6031,7 @@ + png_set_write_fn(ping,image,png_put_data,png_flush_data); + png_pixels=(unsigned char *) NULL; + +- if (setjmp(ping->jmpbuf)) ++ if (setjmp(png_jmpbuf(ping))) + { + /* + PNG write failed. +@@ -6229,12 +6230,12 @@ /* Identify which colormap entry is transparent. */ @@ -40,7 +75,7 @@ for (y=0; y < (long) image->rows; y++) { register const PixelPacket -@@ -6254,7 +6254,7 @@ +@@ -6254,7 +6255,7 @@ index=indexes[x]; assert((unsigned long) index < number_colors); @@ -49,7 +84,7 @@ ScaleQuantumToChar(p->opacity)); } p++; -@@ -6262,14 +6262,14 @@ +@@ -6262,14 +6263,14 @@ } ping_info->num_trans=0; for (i=0; i < (long) number_colors; i++) @@ -66,7 +101,7 @@ /* Identify which colormap entry is the background color. */ -@@ -6388,12 +6388,12 @@ +@@ -6388,12 +6389,12 @@ if (ping_info->bit_depth == 1) mask=0x0001; ping_info->valid|=PNG_INFO_tRNS; @@ -84,7 +119,7 @@ (ScaleQuantumToChar(MaxRGB-p->opacity)); } if (ping_info->valid & PNG_INFO_tRNS) -@@ -6413,7 +6413,7 @@ +@@ -6413,7 +6414,7 @@ { if (p->opacity != OpaqueOpacity) { @@ -93,7 +128,7 @@ { break; /* Can't use RGB + tRNS for multiple transparent colors. */ -@@ -6426,7 +6426,7 @@ +@@ -6426,7 +6427,7 @@ } else { @@ -102,7 +137,7 @@ break; /* Can't use RGB + tRNS when another pixel having the same RGB samples is transparent. */ -@@ -6444,10 +6444,10 @@ +@@ -6444,10 +6445,10 @@ ping_info->color_type &= 0x03; /* changes 4 or 6 to 0 or 2 */ if (image->depth == 8) { @@ -117,7 +152,7 @@ } } } -@@ -6463,7 +6463,7 @@ +@@ -6463,7 +6464,7 @@ { ping_info->color_type=PNG_COLOR_TYPE_GRAY; if (save_image_depth == 16 && image->depth == 8) @@ -126,7 +161,7 @@ } if (image->depth > QuantumDepth) image->depth=QuantumDepth; -@@ -6577,14 +6577,14 @@ +@@ -6577,14 +6578,14 @@ /* Identify which colormap entry is transparent. */ @@ -144,7 +179,7 @@ for (y=0; y < (long) image->rows; y++) { register const PixelPacket -@@ -6604,21 +6604,21 @@ +@@ -6604,21 +6605,21 @@ index=indexes[x]; assert((unsigned long) index < number_colors); @@ -169,7 +204,7 @@ } /* -@@ -6636,10 +6636,10 @@ +@@ -6636,10 +6637,10 @@ image->depth=8; if ((save_image_depth == 16) && (image->depth == 8)) { @@ -184,7 +219,7 @@ } } -@@ -6666,8 +6666,8 @@ +@@ -6666,8 +6667,8 @@ " Setting up bKGD chunk"); png_set_bKGD(ping,ping_info,&background); @@ -195,7 +230,7 @@ } } if (logging) -@@ -7174,7 +7174,7 @@ +@@ -7174,7 +7175,7 @@ #endif if (ping_info->valid & PNG_INFO_tRNS) { diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile index 355ac6e6e0a6..fae3f1e3ccc4 100644 --- a/graphics/GraphicsMagick12/Makefile +++ b/graphics/GraphicsMagick12/Makefile @@ -7,7 +7,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF \ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.2/ @@ -19,10 +19,11 @@ COMMENT= Fast image processing tools based on ImageMagick CONFLICTS= GraphicsMagick-1.[13].* LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ + png15:${PORTSDIR}/graphics/png \ jbig:${PORTSDIR}/graphics/jbigkit \ wmflite:${PORTSDIR}/graphics/libwmf \ xml2:${PORTSDIR}/textproc/libxml2 -OTHERGRAPHICS= jasper jpeg lcms png tiff +OTHERGRAPHICS= jasper jpeg lcms tiff LIB_DEPENDS+= ${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|} OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \ FPX "Enable FlashPIX support" on \ @@ -54,7 +55,7 @@ USE_LDCONFIG= yes ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` CFLAGS+= -DPNG_DEPSTRUCT= -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib test check: diff --git a/graphics/GraphicsMagick12/files/patch-coders__png.c b/graphics/GraphicsMagick12/files/patch-coders__png.c index df3c5041e522..dcf0b339174d 100644 --- a/graphics/GraphicsMagick12/files/patch-coders__png.c +++ b/graphics/GraphicsMagick12/files/patch-coders__png.c @@ -1,6 +1,32 @@ --- coders/png.c.orig 2010-01-06 23:01:31.000000000 +0100 -+++ coders/png.c 2010-03-28 17:21:20.000000000 +0200 -@@ -1955,13 +1955,13 @@ ++++ coders/png.c 2012-05-10 04:50:59.000000000 +0200 +@@ -75,6 +75,7 @@ + #if defined(HasPNG) + #include "png.h" + #include "zlib.h" ++#include "pngpriv.h" + + #if PNG_LIBPNG_VER > 95 + /* +@@ -1292,7 +1293,7 @@ + " libpng-%.1024s error: %.1024s", PNG_LIBPNG_VER_STRING, + message); + (void) ThrowException2(&image->exception,CoderError,message,image->filename); +- longjmp(ping->jmpbuf,1); ++ longjmp(png_jmpbuf(ping),1); + } + + static void PNGWarningHandler(png_struct *ping,png_const_charp message) +@@ -1593,7 +1594,7 @@ + ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image); + } + png_pixels=(unsigned char *) NULL; +- if (setjmp(ping->jmpbuf)) ++ if (setjmp(png_jmpbuf(ping))) + { + /* + PNG image is corrupt. +@@ -1955,13 +1956,13 @@ Image has a transparent background. */ transparent_color.red= @@ -18,7 +44,7 @@ if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) { transparent_color.red=transparent_color.opacity; -@@ -2469,7 +2469,7 @@ +@@ -2469,7 +2470,7 @@ index=indexes[x]; if (index < ping_info->num_trans) q->opacity= @@ -27,7 +53,16 @@ else q->opacity=OpaqueOpacity; q++; -@@ -6258,13 +6258,13 @@ +@@ -6054,7 +6055,7 @@ + AcquireSemaphoreInfo(&png_semaphore); + #endif + +- if (setjmp(ping->jmpbuf)) ++ if (setjmp(png_jmpbuf(ping))) + { + /* + PNG write failed. +@@ -6258,13 +6259,13 @@ /* Identify which colormap entry is transparent. */ @@ -44,7 +79,7 @@ for (y=0; y < (long) image->rows; y++) { register const PixelPacket -@@ -6284,7 +6284,7 @@ +@@ -6284,7 +6285,7 @@ index=indexes[x]; assert((unsigned long) index < number_colors); @@ -53,7 +88,7 @@ ScaleQuantumToChar(p->opacity)); } p++; -@@ -6292,14 +6292,14 @@ +@@ -6292,14 +6293,14 @@ } ping_info->num_trans=0; for (i=0; i < (long) number_colors; i++) @@ -70,7 +105,7 @@ /* Identify which colormap entry is the background color. */ -@@ -6441,12 +6441,12 @@ +@@ -6441,12 +6442,12 @@ (p->opacity != OpaqueOpacity)) { ping_info->valid|=PNG_INFO_tRNS; @@ -88,7 +123,7 @@ (ScaleQuantumToChar(MaxRGB-p->opacity)); } } -@@ -6467,7 +6467,7 @@ +@@ -6467,7 +6468,7 @@ { if (p->opacity != OpaqueOpacity) { @@ -97,7 +132,7 @@ { break; /* Can't use RGB + tRNS for multiple transparent colors. */ -@@ -6480,7 +6480,7 @@ +@@ -6480,7 +6481,7 @@ } else { @@ -106,7 +141,7 @@ break; /* Can't use RGB + tRNS when another pixel having the same RGB samples is transparent. */ -@@ -6498,10 +6498,10 @@ +@@ -6498,10 +6499,10 @@ ping_info->color_type &= 0x03; /* changes 4 or 6 to 0 or 2 */ if (image->depth == 8) { @@ -121,7 +156,7 @@ } } } -@@ -6517,7 +6517,7 @@ +@@ -6517,7 +6518,7 @@ { ping_info->color_type=PNG_COLOR_TYPE_GRAY; if (save_image_depth == 16 && image->depth == 8) @@ -130,7 +165,7 @@ } if (image->depth > QuantumDepth) image->depth=QuantumDepth; -@@ -6701,13 +6701,13 @@ +@@ -6701,13 +6702,13 @@ ping_info->num_trans=0; if (ping_info->num_trans != 0) { @@ -147,7 +182,7 @@ } } -@@ -6726,10 +6726,10 @@ +@@ -6726,10 +6727,10 @@ image->depth=8; if ((save_image_depth == 16) && (image->depth == 8)) { @@ -162,7 +197,7 @@ } } -@@ -6756,8 +6756,8 @@ +@@ -6756,8 +6757,8 @@ " Setting up bKGD chunk"); png_set_bKGD(ping,ping_info,&background); @@ -173,7 +208,7 @@ } } if (logging) -@@ -7332,7 +7332,7 @@ +@@ -7332,7 +7333,7 @@ #endif if (ping_info->valid & PNG_INFO_tRNS) { @@ -182,3 +217,16 @@ ping_info->valid&=(~PNG_INFO_tRNS); } png_destroy_write_struct(&ping,&ping_info); +@@ -8416,10 +8416,10 @@ + { + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " TERM delay: %lu", +- (png_uint_32) (mng_info->ticks_per_second*final_delay/100)); ++ (uint64_t) (mng_info->ticks_per_second*final_delay/100)); + if (image->iterations == 0) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), +- " TERM iterations: %lu",PNG_MAX_UINT); ++ " TERM iterations: %lu", (uint64_t)PNG_MAX_UINT); + else + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " Image iterations: %lu", diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile index 0a72072a3034..bee8a2196025 100644 --- a/graphics/GraphicsMagick13/Makefile +++ b/graphics/GraphicsMagick13/Makefile @@ -7,6 +7,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.3.15 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF \ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/ @@ -19,10 +20,11 @@ COMMENT= Fast image processing tools based on ImageMagick CONFLICTS= GraphicsMagick-1.[12].* LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ + png15:${PORTSDIR}/graphics/png \ jbig:${PORTSDIR}/graphics/jbigkit \ wmflite:${PORTSDIR}/graphics/libwmf \ xml2:${PORTSDIR}/textproc/libxml2 -OTHERGRAPHICS= jasper jpeg lcms png tiff +OTHERGRAPHICS= jasper jpeg lcms tiff LIB_DEPENDS+= ${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|} OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \ diff --git a/graphics/IPA/Makefile b/graphics/IPA/Makefile index be09377ebee5..bac89da5a714 100644 --- a/graphics/IPA/Makefile +++ b/graphics/IPA/Makefile @@ -8,6 +8,7 @@ PORTNAME= IPA PORTVERSION= 1.08 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.prima.eu.org/IPA/ CPAN/Prima/KARASIK diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 41b722c615fb..59d9629ef297 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -7,6 +7,7 @@ PORTNAME= ImageMagick DISTVERSION= 6.7.7-0 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \ http://image_magick.veidrodis.com/image_magick/ \ @@ -190,7 +191,7 @@ PLIST_SUB+= JPEG="@comment " .endif .if !defined(WITHOUT_IMAGEMAGICK_PNG) -LIB_DEPENDS+= png:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png PLIST_SUB+= PNG="" .else CONFIGURE_ARGS+= --without-png diff --git a/graphics/a2png/Makefile b/graphics/a2png/Makefile index 5699315b1119..bd03e838e060 100644 --- a/graphics/a2png/Makefile +++ b/graphics/a2png/Makefile @@ -7,7 +7,7 @@ PORTNAME= a2png PORTVERSION= 0.1.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile index cde5ed737a0b..fef5fcac9f8e 100644 --- a/graphics/aaphoto/Makefile +++ b/graphics/aaphoto/Makefile @@ -7,6 +7,7 @@ PORTNAME= aaphoto PORTVERSION= 0.41 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://log69.com/downloads/ DISTNAME= ${PORTNAME}_sources_v${PORTVERSION} @@ -16,7 +17,7 @@ COMMENT= Auto Adjust Photo, automatic color correction of photos LIB_DEPENDS= jasper:${PORTSDIR}/graphics/jasper \ jpeg:${PORTSDIR}/graphics/jpeg \ - png:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png LICENSE= GPLv3 diff --git a/graphics/aaphoto/files/patch-aaphoto.c b/graphics/aaphoto/files/patch-aaphoto.c new file mode 100644 index 000000000000..adb518502a76 --- /dev/null +++ b/graphics/aaphoto/files/patch-aaphoto.c @@ -0,0 +1,10 @@ +--- aaphoto.c.orig 2011-01-26 16:39:58.000000000 +0100 ++++ aaphoto.c 2012-04-23 19:07:00.000000000 +0200 +@@ -243,6 +243,7 @@ + #ifndef __BMP_ONLY__ + #include <jasper/jasper.h> + #include <png.h> ++#include <zlib.h> + #include <jpeglib.h> + #endif + diff --git a/graphics/aeskulap/Makefile b/graphics/aeskulap/Makefile index 494e1ea34dbb..0e03dbc264e7 100644 --- a/graphics/aeskulap/Makefile +++ b/graphics/aeskulap/Makefile @@ -7,7 +7,7 @@ PORTNAME= aeskulap PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.bms-austria.com/%7Epipelka/${PORTNAME}/ diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile index 8029678f2a96..0a7ae383aeb1 100644 --- a/graphics/agave/Makefile +++ b/graphics/agave/Makefile @@ -7,7 +7,7 @@ PORTNAME= agave PORTVERSION= 0.4.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics gnome MASTER_SITES= http://download.gna.org/colorscheme/releases/ diff --git a/graphics/albumshaper/Makefile b/graphics/albumshaper/Makefile index be7e464b0388..4922cac63400 100644 --- a/graphics/albumshaper/Makefile +++ b/graphics/albumshaper/Makefile @@ -7,7 +7,7 @@ PORTNAME= albumshaper PORTVERSION= 2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/graphics/ale/Makefile b/graphics/ale/Makefile index 78a949236f6f..1de19cbc2e99 100644 --- a/graphics/ale/Makefile +++ b/graphics/ale/Makefile @@ -8,7 +8,7 @@ PORTNAME= ale PORTVERSION= 0.8.11.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://auricle.dyndns.org/ALE/download/ diff --git a/graphics/alpng/Makefile b/graphics/alpng/Makefile index ea2174c6f699..ca80f98378e0 100644 --- a/graphics/alpng/Makefile +++ b/graphics/alpng/Makefile @@ -7,6 +7,7 @@ PORTNAME= alpng PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}13 diff --git a/graphics/amanith/Makefile b/graphics/amanith/Makefile index b78a78159231..d888addbb738 100644 --- a/graphics/amanith/Makefile +++ b/graphics/amanith/Makefile @@ -7,7 +7,7 @@ PORTNAME= amanith PORTVERSION= 0.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://www.amanith.org/download/files/ \ http://louhi.kempele.fi/~skyostil/projects/pyamanith/dist/ @@ -17,7 +17,7 @@ MAINTAINER= acm@FreeBSD.org COMMENT= C++ CrossPlatform framework designed for 2d & 3d vector graphics BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile index b1b6e45bc2c4..ad3b71900e4b 100644 --- a/graphics/amide/Makefile +++ b/graphics/amide/Makefile @@ -7,6 +7,7 @@ PORTNAME= amide PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF EXTRACT_SUFX= .tgz diff --git a/graphics/aolserver-nsgd/Makefile b/graphics/aolserver-nsgd/Makefile index 93c96ee4c535..0ea8b342215b 100644 --- a/graphics/aolserver-nsgd/Makefile +++ b/graphics/aolserver-nsgd/Makefile @@ -7,7 +7,7 @@ PORTNAME= nsgd PORTVERSION= 2.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics www MASTER_SITES= http://www.aolserver.cz/download/ PKGNAMEPREFIX= aolserver- diff --git a/graphics/apngasm/Makefile b/graphics/apngasm/Makefile index c569c55c5a24..f4d5ac550df4 100644 --- a/graphics/apngasm/Makefile +++ b/graphics/apngasm/Makefile @@ -7,6 +7,7 @@ PORTNAME= apngasm PORTVERSION= 2.6 +PORTREVISION= 1 DISTVERSIONSUFFIX=-src CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} @@ -31,7 +32,7 @@ PLIST_FILES= bin/${PORTNAME} .include <bsd.port.pre.mk> .if !defined(NO_SHARED) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .else BUILD_DEPENDS+= ${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png LDFLAGS+= -static diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile index efc785e75bee..bfabb97961b4 100644 --- a/graphics/apvlv/Makefile +++ b/graphics/apvlv/Makefile @@ -7,7 +7,7 @@ PORTNAME= apvlv PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://cloud.github.com/downloads/naihe2010/apvlv/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index fc13f9fb85b8..b3cabb3fba4b 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -8,7 +8,7 @@ PORTNAME= aqsis PORTVERSION= 1.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} DISTNAME= Aqsis-${PORTVERSION}-Source diff --git a/graphics/asciio/Makefile b/graphics/asciio/Makefile index e98424348f68..11d0640135bf 100644 --- a/graphics/asciio/Makefile +++ b/graphics/asciio/Makefile @@ -7,7 +7,7 @@ PORTNAME= asciio PORTVERSION= 1.02.71 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://mirror.switch.ch/ftp/mirror/CPAN/authors/id/N/NK/NKH/ \ CRITICAL diff --git a/graphics/autopano-sift-c/Makefile b/graphics/autopano-sift-c/Makefile index fa834b7bd480..28b6ed36bb28 100644 --- a/graphics/autopano-sift-c/Makefile +++ b/graphics/autopano-sift-c/Makefile @@ -7,7 +7,7 @@ PORTNAME= autopano-sift-C PORTVERSION= 2.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -18,7 +18,7 @@ RESTRICTED= May be covered by patents LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ pano13:${PORTSDIR}/graphics/libpano13 CONFLICTS= autopano-sift-[0-9]* diff --git a/graphics/autoq3d/Makefile b/graphics/autoq3d/Makefile index 6d6a255d3e85..18cf651f73f3 100644 --- a/graphics/autoq3d/Makefile +++ b/graphics/autoq3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoq3d DISTVERSION= 1.40 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION} DISTNAME= AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index 6b46b117823d..ac3ecc3a0c72 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -7,21 +7,21 @@ PORTNAME= autotrace PORTVERSION= 0.31.1 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/AutoTrace/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Convert bitmap to vector graphics -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ MagickWand.5:${PORTSDIR}/graphics/ImageMagick USE_AUTOTOOLS= libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ming +CPPFLAGS+= -I${LOCALBASE}/include/libpng15 MAN1= autotrace.1 diff --git a/graphics/autotrace/files/patch-input-png.c b/graphics/autotrace/files/patch-input-png.c new file mode 100644 index 000000000000..88ca2ebfa153 --- /dev/null +++ b/graphics/autotrace/files/patch-input-png.c @@ -0,0 +1,10 @@ +--- input-png.c.orig 2002-10-10 22:44:14.000000000 +0200 ++++ input-png.c 2012-04-29 12:34:51.000000000 +0200 +@@ -30,6 +30,7 @@ + #include "message.h" + #include "xstd.h" + #include <png.h> ++#include <pngpriv.h> + #include "input-png.h" + + static volatile char rcsid[]="$Id: input-png.c,v 1.16 2002/10/05 19:38:25 masata-y Exp $"; diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile index 0fd4b0e59d3c..aeaf11563f86 100644 --- a/graphics/aview/Makefile +++ b/graphics/aview/Makefile @@ -7,7 +7,7 @@ PORTNAME= aview PORTVERSION= 1.3.0.r1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/aa-project/${PORTNAME}/1.3.0rc1 DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile index 99c1355ef5a8..96f6aa776699 100644 --- a/graphics/ayam/Makefile +++ b/graphics/ayam/Makefile @@ -7,7 +7,7 @@ PORTNAME= ayam PORTVERSION= 1.19 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Ayam/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION}.src diff --git a/graphics/bbrb/Makefile b/graphics/bbrb/Makefile index 4a090c35c0c8..bb7e0de75283 100644 --- a/graphics/bbrb/Makefile +++ b/graphics/bbrb/Makefile @@ -7,7 +7,7 @@ PORTNAME= bbrb PORTVERSION= 0.4.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 63a8bb7f5199..4bb1cb131879 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -6,6 +6,7 @@ PORTNAME= blender PORTVERSION= 2.63 +PORTREVISION= 1 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -15,7 +16,7 @@ MAINTAINER= mva@FreeBSD.org COMMENT= 3D modeling/rendering/animation/gaming package LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 USE_XORG= x11 xext xmu diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile index cc1c3c518ace..389637478f81 100644 --- a/graphics/bmeps/Makefile +++ b/graphics/bmeps/Makefile @@ -7,7 +7,7 @@ PORTNAME= bmeps PORTVERSION= 2.2.22 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics perl5 MASTER_SITES= SF/dktools/dktools/dktools-${PORTVERSION} DISTNAME= dktools-${PORTVERSION} @@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/bsdlic.txt LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ netpbm:${PORTSDIR}/graphics/netpbm \ - png:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_ZIP= yes USE_PERL5= yes diff --git a/graphics/bmp-rootvis/Makefile b/graphics/bmp-rootvis/Makefile index 2a7e2521a557..8e47515306ae 100644 --- a/graphics/bmp-rootvis/Makefile +++ b/graphics/bmp-rootvis/Makefile @@ -7,7 +7,7 @@ PORTNAME= bmp-rootvis PORTVERSION= 0.0.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= bmp-plugins diff --git a/graphics/box/Makefile b/graphics/box/Makefile index 4d8dc7681e6b..062ef1aad98c 100644 --- a/graphics/box/Makefile +++ b/graphics/box/Makefile @@ -7,6 +7,7 @@ PORTNAME= box PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}c/Box%20-%20the%20compiler/${DISTNAME}/ diff --git a/graphics/boxer/Makefile b/graphics/boxer/Makefile index 00c4de6edd22..d33948c08acf 100644 --- a/graphics/boxer/Makefile +++ b/graphics/boxer/Makefile @@ -7,6 +7,7 @@ PORTNAME= boxer PORTVERSION= 0.3.7 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/boxc/${PORTNAME:C/^b/B/}%20-%20the%20Box%20GUI/${DISTNAME}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/cairo-java/Makefile b/graphics/cairo-java/Makefile index b92065c13333..999a9e56b0f1 100644 --- a/graphics/cairo-java/Makefile +++ b/graphics/cairo-java/Makefile @@ -8,7 +8,7 @@ PORTNAME= cairo-java PORTVERSION= 1.0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics java MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 47df7fc2bcff..4ded27affaba 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -8,7 +8,7 @@ PORTNAME= cairo PORTVERSION= 1.10.2 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH?= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -20,7 +20,7 @@ COMMENT= Vector graphics library with cross-device output support .if !defined(REFERENCE_PORT) LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ pixman-1.9:${PORTSDIR}/x11/pixman diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index f71a7ca6e206..947b917ea120 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -8,6 +8,7 @@ PORTNAME= cairomm PORTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ diff --git a/graphics/cbrpager/Makefile b/graphics/cbrpager/Makefile index 9b363925cd1f..4a7dc96f60cb 100644 --- a/graphics/cbrpager/Makefile +++ b/graphics/cbrpager/Makefile @@ -8,7 +8,7 @@ PORTNAME= cbrpager PORTVERSION= 0.9.22 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile index 9c9c0dd01e98..241a9ce57d2d 100644 --- a/graphics/cegui/Makefile +++ b/graphics/cegui/Makefile @@ -7,7 +7,7 @@ PORTNAME= cegui PORTVERSION= 0.7.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics devel MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.7.5 DISTNAME= ${PORTNAME:U}-${PORTVERSION} diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile index ece1ef6728e7..913ed929403c 100644 --- a/graphics/cfdg/Makefile +++ b/graphics/cfdg/Makefile @@ -7,6 +7,7 @@ PORTNAME= cfdg PORTVERSION= 2.2.2 +PORTREVISION= 1 CATEGORIES= graphics math MASTER_SITES= http://www.contextfreeart.org/download/ \ http://glyphic.s3.amazonaws.com/cfa/download/ @@ -16,7 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= anatoly.borodin@gmail.com COMMENT= Context Free Design Grammar compiler -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile index 3c6fc5d6ae03..ff4975c7dc23 100644 --- a/graphics/chbg/Makefile +++ b/graphics/chbg/Makefile @@ -7,7 +7,7 @@ PORTNAME= chbg PORTVERSION= 1.5 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics gnome MASTER_SITES= SF EXTRACT_SUFX= .tgz @@ -15,6 +15,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Change Background Picture with time period +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png + USE_GNOME= gdkpixbuf USE_GMAKE= yes USE_GETTEXT= yes diff --git a/graphics/chbg/files/patch-absimg.c b/graphics/chbg/files/patch-absimg.c new file mode 100644 index 000000000000..62662be69d8c --- /dev/null +++ b/graphics/chbg/files/patch-absimg.c @@ -0,0 +1,11 @@ +--- src/absimg.c.orig 2001-01-08 19:42:18.000000000 +0100 ++++ src/absimg.c 2012-05-09 12:34:28.000000000 +0200 +@@ -96,7 +96,7 @@ + + pngi = png_create_info_struct(pngw); + +- if (setjmp(pngw->jmpbuf)) ++ if (setjmp(png_jmpbuf(pngw))) + { + png_destroy_write_struct(&pngw, &pngi); + fclose(f); diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 41877d79f9fe..75cfaffff4f4 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -7,7 +7,7 @@ PORTNAME= cimg PORTVERSION= 1.4.9 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 3 CATEGORIES= graphics devel MASTER_SITES= SF/${PORTNAME} \ @@ -46,7 +46,7 @@ LIB_DEPENDS+= board.0:${PORTSDIR}/graphics/libboard USE_FORTRAN= yes . if !defined(WITH_DEBUG) -LIB_DEPENDS+= png:${PORTSDIR}/graphics/png \ +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ tiff:${PORTSDIR}/graphics/tiff \ opencv_legacy.2:${PORTSDIR}/graphics/opencv \ diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile index 1af947b41ed0..1e9e85c9651d 100644 --- a/graphics/cinepaint/Makefile +++ b/graphics/cinepaint/Makefile @@ -7,7 +7,7 @@ PORTNAME= cinepaint PORTVERSION= 0.22 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/CinePaint/CinePaint-${PORTVERSION}-1 DISTNAME= ${PORTNAME}-${PORTVERSION}-1 @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An editing tool used for painting and retouching of movies LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ lcms.1:${PORTSDIR}/graphics/lcms \ tiff.4:${PORTSDIR}/graphics/tiff \ ftgl.2:${PORTSDIR}/graphics/ftgl @@ -27,7 +27,7 @@ USE_PYTHON= yes USE_GNOME= gtk12 USE_GETTEXT= yes USE_LDCONFIG= yes -USE_XORG= xpm +USE_XORG= xpm xi xext xft xinerama MAN1= cinepaint.1 cinepainttool.1 @@ -38,7 +38,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1 OPTIONS= OPENEXR "Use OpenEXR" on CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib -lintl .include <bsd.port.pre.mk> diff --git a/graphics/cinepaint/files/patch-plug-ins-png-png.c b/graphics/cinepaint/files/patch-plug-ins-png-png.c new file mode 100644 index 000000000000..88a9234da8f0 --- /dev/null +++ b/graphics/cinepaint/files/patch-plug-ins-png-png.c @@ -0,0 +1,28 @@ +--- plug-ins/png/png.c.orig 2006-11-24 21:52:55.000000000 +0100 ++++ plug-ins/png/png.c 2012-04-27 19:08:52.000000000 +0200 +@@ -59,6 +59,7 @@ + #include "libgimp/stdplugins-intl.h" + + #include <png.h> /* PNG library definitions */ ++#include <pngpriv.h> + + /* + * Constants... +@@ -405,7 +406,7 @@ + info = (png_infop)calloc(sizeof(png_info), 1); + #endif /* PNG_LIBPNG_VER > 88 */ + +- if (setjmp (pp->jmpbuf)) ++ if (setjmp (png_jmpbuf(pp))) + { + g_message ("%s\nPNG error. File corrupted?", filename); + return image; +@@ -824,7 +825,7 @@ + info = (png_infop)calloc(sizeof(png_info), 1); + #endif /* PNG_LIBPNG_VER > 88 */ + +- if (setjmp (pp->jmpbuf)) ++ if (setjmp (png_jmpbuf(pp))) + { + g_message ("%s\nPNG error. Couldn't save image", filename); + return 0; diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile index 94fedc8e6b4c..5e57509886fc 100644 --- a/graphics/claraocr/Makefile +++ b/graphics/claraocr/Makefile @@ -7,7 +7,7 @@ PORTNAME= claraocr PORTVERSION= 20031214 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics accessibility MASTER_SITES= ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR=distfiles diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile index 6d1684fafdc6..e324f2197649 100644 --- a/graphics/clutter-box2d/Makefile +++ b/graphics/clutter-box2d/Makefile @@ -7,7 +7,7 @@ PORTNAME= clutter-box2d PORTVERSION= 0.10.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://source.clutter-project.org/sources/${PORTNAME}/0.10/ diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile index c629bff1d2da..b8ca60cfffd4 100644 --- a/graphics/clutter-gtk/Makefile +++ b/graphics/clutter-gtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= clutter-gtk PORTVERSION= 0.10.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= GNOME \ http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/ diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index 76c73370e31f..8681562a5ff5 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -8,6 +8,7 @@ PORTNAME= clutter PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GNOME \ http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/ diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile index be7f6b9754fd..3a330a16e0b0 100644 --- a/graphics/comical/Makefile +++ b/graphics/comical/Makefile @@ -7,7 +7,7 @@ PORTNAME= comical PORTVERSION= 0.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile index e4903216b965..754902d59817 100644 --- a/graphics/corona/Makefile +++ b/graphics/corona/Makefile @@ -6,14 +6,14 @@ PORTNAME= corona PORTVERSION= 1.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A graphics library that supports most image formats -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg USE_AUTOTOOLS= libtool @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib" -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 post-patch: @${REINPLACE_CMD} -e \ diff --git a/graphics/corona/files/patch-OpenPNG.cpp b/graphics/corona/files/patch-OpenPNG.cpp new file mode 100644 index 000000000000..16b474290a6c --- /dev/null +++ b/graphics/corona/files/patch-OpenPNG.cpp @@ -0,0 +1,19 @@ +--- src/OpenPNG.cpp.orig 2002-12-26 02:52:21.000000000 +0100 ++++ src/OpenPNG.cpp 2012-04-30 21:33:15.000000000 +0200 +@@ -6,6 +6,7 @@ +
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include "Debug.h"
+ #include "Open.h"
+ #include "SimpleImage.h"
+@@ -39,7 +40,7 @@ + void PNG_error_function(png_structp png_ptr, png_const_charp warning) {
+ // copied from libpng's pngerror.cpp, but without the fprintf
+ jmp_buf jmpbuf;
+- memcpy(jmpbuf, png_ptr->jmpbuf, sizeof(jmp_buf));
++ memcpy(jmpbuf, png_ptr->longjmp_buffer, sizeof(jmp_buf));
+ longjmp(jmpbuf, 1);
+ }
+
diff --git a/graphics/corona/files/patch-SavePNG.cpp b/graphics/corona/files/patch-SavePNG.cpp new file mode 100644 index 000000000000..ce159f6a50c6 --- /dev/null +++ b/graphics/corona/files/patch-SavePNG.cpp @@ -0,0 +1,9 @@ +--- src/SavePNG.cpp.orig 2003-07-17 01:09:48.000000000 +0200 ++++ src/SavePNG.cpp 2012-05-01 09:51:29.000000000 +0200 +@@ -1,5 +1,6 @@ + #include <memory> + #include <png.h> ++#include <pngpriv.h> + #include "Debug.h" + #include "Save.h" + #include "Types.h" diff --git a/graphics/crw/Makefile b/graphics/crw/Makefile index f1baefb50561..83e971ab5dbf 100644 --- a/graphics/crw/Makefile +++ b/graphics/crw/Makefile @@ -7,22 +7,25 @@ PORTNAME= crw PORTVERSION= 1.03 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://apollo.backplane.com/FreeBSDPorts/ MAINTAINER= ports@FreeBSD.org COMMENT= A utility to process Canon camera RAW (.crw) files -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png MAN1= crw.1 MANCOMPRESSED= yes PLIST_FILES= bin/crw +#CFLAGS+= -I${LOCALBASE}/include/libpng15 + post-patch: @${REINPLACE_CMD} -e 's,/usr/local/lib,${LOCALBASE}/lib,' \ - -e 's,/usr/local/include,${LOCALBASE}/include,' \ + -e 's,CFLAGS=,CFLAGS+=,' \ + -e 's,/usr/local/include,${LOCALBASE}/include,' \ ${WRKSRC}/Makefile .include <bsd.port.mk> diff --git a/graphics/crw/files/patch-crw.c b/graphics/crw/files/patch-crw.c new file mode 100644 index 000000000000..c9c3a8a5aabc --- /dev/null +++ b/graphics/crw/files/patch-crw.c @@ -0,0 +1,11 @@ +--- crw.c.orig 2002-07-23 01:17:37.000000000 +0200 ++++ crw.c 2012-04-27 07:23:34.000000000 +0200 +@@ -1394,7 +1394,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return; + } +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return; + } diff --git a/graphics/cthumb/Makefile b/graphics/cthumb/Makefile index 1d8dcd834712..b880c0d5e687 100644 --- a/graphics/cthumb/Makefile +++ b/graphics/cthumb/Makefile @@ -7,7 +7,7 @@ PORTNAME= cthumb PORTVERSION= 4.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics www MASTER_SITES= SF diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile index 5fa0cbc13a50..72d8126b7dcf 100644 --- a/graphics/curator/Makefile +++ b/graphics/curator/Makefile @@ -7,7 +7,7 @@ PORTNAME= curator PORTVERSION= 2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics www python MASTER_SITES= SF diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile index 8de037908150..3703b42479ec 100644 --- a/graphics/danpei/Makefile +++ b/graphics/danpei/Makefile @@ -7,14 +7,14 @@ PORTNAME= danpei PORTVERSION= 2.9.7 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= bu7cher@yandex.ru COMMENT= Image Viewer for X Window System with thumbnail preview feature -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png .if !defined(WITHOUT_IMAGEMAGICK) RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick diff --git a/graphics/danpei/files/patch-image_cache.c b/graphics/danpei/files/patch-image_cache.c new file mode 100644 index 000000000000..b5c7888df007 --- /dev/null +++ b/graphics/danpei/files/patch-image_cache.c @@ -0,0 +1,11 @@ +--- src/image_cache.c.orig 2003-08-08 09:17:58.000000000 +0200 ++++ src/image_cache.c 2012-05-03 23:39:36.000000000 +0200 +@@ -782,7 +782,7 @@ + return FALSE; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose (fp); + return FALSE; diff --git a/graphics/darknock/Makefile b/graphics/darknock/Makefile index 5f986b93e414..232609f91d91 100644 --- a/graphics/darknock/Makefile +++ b/graphics/darknock/Makefile @@ -7,7 +7,7 @@ PORTNAME= darknock DISTVERSION= 0.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 85889bf34f99..2f033e2f2ee5 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -7,6 +7,7 @@ PORTNAME= darktable PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile index 74e777c5e86d..1f8c79b53cf3 100644 --- a/graphics/dataplot/Makefile +++ b/graphics/dataplot/Makefile @@ -7,6 +7,7 @@ PORTNAME= dataplot PORTVERSION= 20090821 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.nist.gov/pub/dataplot/unix/:source \ LOCAL/beech:source \ @@ -21,7 +22,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A free software system for statistical visualization LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg USE_FORTRAN= yes diff --git a/graphics/dc20ctrl/Makefile b/graphics/dc20ctrl/Makefile index cb9c66b79240..a01a08a4115f 100644 --- a/graphics/dc20ctrl/Makefile +++ b/graphics/dc20ctrl/Makefile @@ -7,7 +7,7 @@ PORTNAME= dc20ctrl PORTVERSION= 0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.paternostro.org/~ugo/binaries/ @@ -16,7 +16,7 @@ COMMENT= Digital camera control and download tool for Kodak DC20 camera LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png MAKE_ARGS= -DUSE_JPEG -DUSE_TIFF -DUSE_PNG diff --git a/graphics/dc20ctrl/files/patch-ad b/graphics/dc20ctrl/files/patch-pixmaps.c index 982285d0386a..8b910130f60c 100644 --- a/graphics/dc20ctrl/files/patch-ad +++ b/graphics/dc20ctrl/files/patch-pixmaps.c @@ -1,6 +1,14 @@ -diff -ru work/dc20ctrl-0.4/pixmaps.c dc20ctrl-0.4/pixmaps.c ---- work/dc20ctrl-0.4/pixmaps.c Tue Feb 17 09:19:47 1998 -+++ pixmaps.c Mon Feb 5 18:42:18 2001 +--- pixmaps.c.orig 1998-02-17 18:19:47.000000000 +0100 ++++ pixmaps.c 2012-04-30 21:36:08.000000000 +0200 +@@ -446,7 +446,7 @@ + if (p) { + if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)) != NULL) { + if ((info_ptr = png_create_info_struct(png_ptr)) != NULL) { +- if (setjmp(png_ptr->jmpbuf) == 0) { ++ if (setjmp(png_jmpbuf(png_ptr)) == 0) { + png_init_io(png_ptr, fp); + png_set_IHDR(png_ptr, info_ptr, p->width, p->height, 8, (p->components == 1) ? PNG_COLOR_TYPE_GRAY : PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + png_write_info(png_ptr, info_ptr); @@ -504,26 +504,32 @@ * Build the image name */ @@ -40,4 +48,3 @@ diff -ru work/dc20ctrl-0.4/pixmaps.c dc20ctrl-0.4/pixmaps.c break; } -Only in dc20ctrl-0.4/: rep diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile index c49d625f322e..bb2389bfe83d 100644 --- a/graphics/devil/Makefile +++ b/graphics/devil/Makefile @@ -8,7 +8,7 @@ PORTNAME= devil PORTVERSION= 1.7.8 PORTEPOCH= 1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/openil/DevIL/${PORTVERSION} DISTNAME= DevIL-${PORTVERSION} @@ -75,7 +75,7 @@ CONFIGURE_ARGS+=--enable-mng CONFIGURE_ENV+= libpng_app=no CONFIGURE_ARGS+=--disable-png .else -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .endif .if defined(WITHOUT_TIFF) diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index a941727bcc25..c0dfb727ef80 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -8,7 +8,7 @@ PORTNAME= dia DISTVERSION= 0.97.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME @@ -18,7 +18,8 @@ MAINTAINER?= gnome@FreeBSD.org COMMENT= Diagram creation program, similar to Visio BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ + png15:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_GMAKE= yes diff --git a/graphics/dia/files/patch-export_png.c b/graphics/dia/files/patch-export_png.c new file mode 100644 index 000000000000..c8553994dc9c --- /dev/null +++ b/graphics/dia/files/patch-export_png.c @@ -0,0 +1,11 @@ +--- plug-ins/libart/export_png.c.orig 2009-11-28 13:49:21.000000000 +0100 ++++ plug-ins/libart/export_png.c 2012-05-08 07:23:21.000000000 +0200 +@@ -178,7 +178,7 @@ + } + + /* set error handling ... */ +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + fclose(fp); + png_destroy_write_struct(&png, &info); + message_error(_("Error occurred while writing PNG")); diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile index ce84c8471ee2..5bad5748180c 100644 --- a/graphics/diacanvas2/Makefile +++ b/graphics/diacanvas2/Makefile @@ -8,7 +8,7 @@ PORTNAME= diacanvas2 PORTVERSION= 0.15.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics gnome MASTER_SITES= SF/diacanvas/DiaCanvas2/${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/graphics/digikam-doc/Makefile b/graphics/digikam-doc/Makefile index 950545e8e0fd..3a7603395f7b 100644 --- a/graphics/digikam-doc/Makefile +++ b/graphics/digikam-doc/Makefile @@ -7,7 +7,7 @@ PORTNAME= digikam-doc PORTVERSION= 0.9.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME:S/-doc//}/${PORTNAME}/${PORTVERSION} diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile index 72a6cf58900b..0153e8459b80 100644 --- a/graphics/digikam-kde4/Makefile +++ b/graphics/digikam-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= digikam DISTVERSION= 1.9.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics kde MASTER_SITES= SF @@ -17,7 +17,7 @@ COMMENT= An advanced digital photo management application for KDE4 LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ lcms.1:${PORTSDIR}/graphics/lcms \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jasper.4:${PORTSDIR}/graphics/jasper \ lqr-1.3:${PORTSDIR}/graphics/liblqr-1 \ kipi.8:${PORTSDIR}/graphics/libkipi-kde4 \ diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index c2822fb780c7..a4336fd8dc5d 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -7,7 +7,7 @@ PORTNAME= digikam DISTVERSION= 0.9.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= SF @@ -20,7 +20,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ kexiv2.5:${PORTSDIR}/graphics/libkexiv2 \ lcms.1:${PORTSDIR}/graphics/lcms \ kdcraw.4:${PORTSDIR}/graphics/libkdcraw \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ jasper.4:${PORTSDIR}/graphics/jasper @@ -34,6 +34,7 @@ USE_GETTEXT= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes +CFLAGS+= -I${LOCALBASE}/include/libpng15 CONFIGURE_ARGS= --without-included-sqlite3 MAN1= digitaglinktree.1 diff --git a/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp b/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp index 6309033f8f68..2f5bb7f5202c 100644 --- a/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp +++ b/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp @@ -1,6 +1,14 @@ --- digikam/kioslave/digikamthumbnail.cpp.orig 2009-07-03 07:19:41.000000000 +0200 -+++ digikam/kioslave/digikamthumbnail.cpp 2010-03-29 19:04:20.000000000 +0200 -@@ -370,7 +370,7 @@ ++++ digikam/kioslave/digikamthumbnail.cpp 2012-05-04 00:15:30.000000000 +0200 +@@ -94,6 +94,7 @@ + #include <sys/shm.h> + #include <sys/time.h> + #include <png.h> ++#include <pngpriv.h> + } + + using namespace KIO; +@@ -370,7 +371,7 @@ unsigned char buf[PNG_BYTES_TO_CHECK]; fread(buf, 1, PNG_BYTES_TO_CHECK, f); @@ -9,7 +17,16 @@ { fclose(f); return qimage; -@@ -465,7 +465,7 @@ +@@ -392,7 +393,7 @@ + return qimage; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -465,7 +466,7 @@ { png_set_gray_to_rgb(png_ptr); if (png_get_bit_depth(png_ptr, info_ptr) < 8) diff --git a/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp b/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp index 6e0baf03bb97..df06684da2ad 100644 --- a/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp +++ b/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp @@ -1,5 +1,5 @@ --- digikam/libs/dimg/loaders/pngloader.cpp.orig 2009-07-03 07:19:41.000000000 +0200 -+++ digikam/libs/dimg/loaders/pngloader.cpp 2010-03-29 18:35:49.000000000 +0200 ++++ digikam/libs/dimg/loaders/pngloader.cpp 2012-05-05 08:00:13.000000000 +0200 @@ -88,7 +88,11 @@ unsigned char buf[PNG_BYTES_TO_CHECK]; @@ -36,7 +36,17 @@ png_set_gray_to_rgb(png_ptr); if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel -@@ -526,7 +538,11 @@ +@@ -403,7 +415,8 @@ + + QMap<int, QByteArray>& metaData = imageMetaData(); + +- png_charp profile_name, profile_data=NULL; ++ png_charp profile_name=NULL; ++ png_byte *profile_data=NULL; + png_uint_32 profile_size; + int compression_type; + +@@ -526,7 +539,11 @@ // PNG error handling. If an error occurs during writing, libpng // will jump here @@ -49,3 +59,12 @@ { DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl; fclose(f); +@@ -599,7 +616,7 @@ + + if (!profile_rawdata.isEmpty()) + { +- png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size()); ++ png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, (png_byte*) profile_rawdata.data(), profile_rawdata.size()); + } + + // ------------------------------------------------------------------- diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile index 1164c98b26b4..a83cac27604b 100644 --- a/graphics/divxcalc/Makefile +++ b/graphics/divxcalc/Makefile @@ -8,7 +8,7 @@ PORTNAME= divxcalc PORTVERSION= 0.6 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://www.axllent.org/uploads/files/divxcalc/ diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index e2a9a10e3254..a78b89741071 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -7,6 +7,7 @@ PORTNAME= djview PORTVERSION= 4.9 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/djvu/DjView/${PORTVERSION} diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index 0e8624867d28..b82ef627bfbd 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -7,6 +7,7 @@ PORTNAME= djvulibre PORTVERSION= 3.5.24 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION} diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile index fb0e1373e826..d8a583241295 100644 --- a/graphics/dmtx-utils/Makefile +++ b/graphics/dmtx-utils/Makefile @@ -7,6 +7,7 @@ PORTNAME= dmtx-utils PORTVERSION= 0.7.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF MASTER_SITE_SUBDIR=libdmtx/libdmtx/${PORTVERSION} diff --git a/graphics/easypaint/Makefile b/graphics/easypaint/Makefile index 63a4c53cf855..ef91dc00303e 100644 --- a/graphics/easypaint/Makefile +++ b/graphics/easypaint/Makefile @@ -7,6 +7,7 @@ PORTNAME= easypaint PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://qt-apps.org/CONTENT/content-files/ DISTNAME= 140877-easyPaint diff --git a/graphics/ecg2png/Makefile b/graphics/ecg2png/Makefile index 5e760ed1badf..b0e36a982aa4 100644 --- a/graphics/ecg2png/Makefile +++ b/graphics/ecg2png/Makefile @@ -7,7 +7,7 @@ PORTNAME= ecg2png PORTVERSION= 0.30 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= http://www.cardiothink.com/downloads/ecg2png/ diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile index 6ffafad7d785..16f408c5460a 100644 --- a/graphics/edje/Makefile +++ b/graphics/edje/Makefile @@ -7,6 +7,7 @@ PORTNAME= edje DISTVERSION= 1.0.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= graphics enlightenment MASTER_SITES= http://download.enlightenment.org/releases/ \ diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile index 9aa1c4624b19..ffd74be98b27 100644 --- a/graphics/edje_viewer/Makefile +++ b/graphics/edje_viewer/Makefile @@ -8,6 +8,7 @@ PORTNAME= edje_viewer PORTVERSION= 20110129 +PORTREVISION= 1 CATEGORIES= graphics enlightenment MASTER_SITES= http://files.roorback.net/e17/2011-01-29/extra/ diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile index 95b7b124ff75..08d9960eb095 100644 --- a/graphics/electriceyes/Makefile +++ b/graphics/electriceyes/Makefile @@ -7,7 +7,7 @@ PORTNAME= electriceyes PORTVERSION= 0.3.12 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/ee/0.3 diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile index bb6d87cd2090..61c812ef0a16 100644 --- a/graphics/electrix/Makefile +++ b/graphics/electrix/Makefile @@ -7,6 +7,7 @@ PORTNAME= electrix PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= SF/${PORTNAME:L}/${PORTVERSION} diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile index f848c9e6e518..1e3c3b3836f5 100644 --- a/graphics/enblend/Makefile +++ b/graphics/enblend/Makefile @@ -7,7 +7,7 @@ PORTNAME= enblend PORTVERSION= 3.1.r20080615 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= vd/enblend @@ -33,7 +33,7 @@ USE_AUTOTOOLS= automake:env autoconf:env USE_GCC= 4.4+ USE_GL= glew glut GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib MAN1= enblend.1 enfuse.1 diff --git a/graphics/enblend/files/patch-png.cxx b/graphics/enblend/files/patch-png.cxx index 2a513b548c54..44c19933dc57 100644 --- a/graphics/enblend/files/patch-png.cxx +++ b/graphics/enblend/files/patch-png.cxx @@ -1,11 +1,223 @@ --- src/vigra_impex/png.cxx.orig 2007-11-25 00:46:55.000000000 +0100 -+++ src/vigra_impex/png.cxx 2010-03-29 11:49:42.000000000 +0200 -@@ -276,7 +276,7 @@ ++++ src/vigra_impex/png.cxx 2012-05-27 11:57:18.000000000 +0200 +@@ -64,6 +64,7 @@ + extern "C" + { + #include <png.h> ++#include <pngpriv.h> + } + + #if PNG_LIBPNG_VER < 10201 +@@ -82,7 +83,7 @@ + static void PngError( png_structp png_ptr, png_const_charp error_msg ) + { + png_error_message = std::string(error_msg); +- longjmp( png_ptr->jmpbuf, 1 ); ++ longjmp( png_jmpbuf(png_ptr), 1 ); + } + + // called on non-fatal errors +@@ -214,7 +215,7 @@ + vigra_postcondition( png != 0, "could not create the read struct." ); + + // create info struct +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() ); + } +@@ -222,14 +223,14 @@ + vigra_postcondition( info != 0, "could not create the info struct." ); + + // init png i/o +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); + } + png_init_io( png, file.get() ); + + // specify that the signature was already read +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() ); + } +@@ -245,13 +246,13 @@ + void PngDecoderImpl::init() + { + // read all chunks up to the image data +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() ); + png_read_info( png, info ); + + // pull over the header fields + int interlace_method, compression_method, filter_method; +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() ); + png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type, + &interlace_method, &compression_method, &filter_method ); +@@ -265,7 +266,7 @@ + + // transform palette to rgb + if ( color_type == PNG_COLOR_TYPE_PALETTE) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() ); + png_set_palette_to_rgb(png); + color_type = PNG_COLOR_TYPE_RGB; +@@ -274,9 +275,9 @@ + + // expand gray values to at least one byte size if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); - png_set_gray_1_2_4_to_8(png); + png_set_expand_gray_1_2_4_to_8(png); bit_depth = 8; } +@@ -284,7 +285,7 @@ + #if 0 + // strip alpha channel + if ( color_type & PNG_COLOR_MASK_ALPHA ) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() ); + png_set_strip_alpha(png); + color_type ^= PNG_COLOR_MASK_ALPHA; +@@ -326,7 +327,7 @@ + #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) + char * dummyName; + int dummyCompType; +- char * profilePtr; ++ png_byte * profilePtr; + png_uint_32 profileLen; + if (info->valid & PNG_INFO_iCCP) { + png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; +@@ -341,7 +342,7 @@ + // image gamma + double image_gamma = 0.45455; + if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() ); + png_get_gAMA( png, info, &image_gamma ); + } +@@ -350,26 +351,26 @@ + double screen_gamma = 2.2; + + // set gamma correction +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() ); + png_set_gamma( png, screen_gamma, image_gamma ); + #endif + + // interlace handling, get number of read passes needed +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str()); + n_interlace_passes = png_set_interlace_handling(png); + + // update png library state to reflect any changes that were made +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() ); + png_read_update_info( png, info ); + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str()); + n_channels = png_get_channels(png, info); + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str()); + rowsize = png_get_rowbytes(png, info); + +@@ -380,7 +381,7 @@ + void PngDecoderImpl::nextScanline() + { + for (int i=0; i < n_interlace_passes; i++) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str()); + png_read_row(png, row_data.begin(), NULL); + } +@@ -546,7 +547,7 @@ + vigra_postcondition( png != 0, "could not create the write struct." ); + + // create info struct +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + png_destroy_write_struct( &png, &info ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() ); + } +@@ -557,7 +558,7 @@ + } + + // init png i/o +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + png_destroy_write_struct( &png, &info ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); + } +@@ -572,7 +573,7 @@ + void PngEncoderImpl::finalize() + { + // write the IHDR +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() ); + png_set_IHDR( png, info, width, height, bit_depth, color_type, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, +@@ -580,7 +581,7 @@ + + // set resolution + if (x_resolution > 0 && y_resolution > 0) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() ); + png_set_pHYs(png, info, (png_uint_32) (x_resolution * 254 + 0.5), + (png_uint_32) (y_resolution * 254 + 0.5), +@@ -589,7 +590,7 @@ + + // set offset + if (position.x > 0 && position.y > 0) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() ); + png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL); + } +@@ -598,12 +599,12 @@ + // set icc profile + if (iccProfile.size() > 0) { + png_set_iCCP(png, info, "icc", 0, +- (char *)iccProfile.begin(), iccProfile.size()); ++ (png_const_bytep)iccProfile.begin(), iccProfile.size()); + } + #endif + + // write the info struct +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() ); + png_write_info( png, info ); + +@@ -635,10 +636,10 @@ + } + + // write the whole image +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() ); + png_write_image( png, row_pointers.begin() ); +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() ); + png_write_end(png, info); + } diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile index 34bfca699dcc..8292760c0c53 100644 --- a/graphics/enfle/Makefile +++ b/graphics/enfle/Makefile @@ -7,7 +7,7 @@ PORTNAME= enfle PORTVERSION= 20101006 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://enfle.fennel.org/files/stable/ @@ -20,7 +20,7 @@ LIB_DEPENDS= arc.1:${PORTSDIR}/archivers/libarc \ jpeg.11:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ gif.5:${PORTSDIR}/graphics/giflib \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ theora.0:${PORTSDIR}/multimedia/libtheora RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -42,7 +42,7 @@ CONFIGURE_ARGS= --with-ungif PKGDEINSTALL= ${PKGINSTALL} -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/graphics/enfle/files/patch-plugins-loader-png-png.c b/graphics/enfle/files/patch-plugins-loader-png-png.c index eab0c8c1ed78..956b39a4fdcb 100644 --- a/graphics/enfle/files/patch-plugins-loader-png-png.c +++ b/graphics/enfle/files/patch-plugins-loader-png-png.c @@ -1,6 +1,14 @@ ---- plugins/loader/png/png.c.orig 2006-03-12 09:24:16.000000000 +0100 -+++ plugins/loader/png/png.c 2010-03-29 16:51:07.000000000 +0200 -@@ -156,7 +156,7 @@ +--- plugins/loader/png/png.c.orig 2010-10-06 14:47:32.000000000 +0200 ++++ plugins/loader/png/png.c 2012-05-04 07:30:47.000000000 +0200 +@@ -34,6 +34,7 @@ + #error Install libpng + #endif + #endif ++# include <pngpriv.h> + + #include "enfle/loader-plugin.h" + #include "utils/libstring.h" +@@ -156,7 +157,7 @@ int try_when_error; unsigned int i, num_text; int num_trans; @@ -9,7 +17,7 @@ png_bytep trans; //debug_message("png loader: load() called\n"); -@@ -260,7 +260,7 @@ +@@ -260,7 +261,7 @@ color_type = png_get_color_type(png_ptr, info_ptr); /* Set the transparent color */ @@ -18,7 +26,7 @@ //p->transparent_disposal = info->transparent_disposal; switch (color_type) { case PNG_COLOR_TYPE_PALETTE: -@@ -273,13 +273,13 @@ +@@ -273,13 +274,13 @@ break; case PNG_COLOR_TYPE_RGB: case PNG_COLOR_TYPE_RGB_ALPHA: diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile index 6f1b8cd1d650..19baba1b1844 100644 --- a/graphics/eog-plugins/Makefile +++ b/graphics/eog-plugins/Makefile @@ -8,7 +8,7 @@ PORTNAME= eog-plugins PORTVERSION= 2.30.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index f752f1ce9e83..e50f622e47ca 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -8,7 +8,7 @@ PORTNAME= eog PORTVERSION= 2.32.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/eos-movrec/Makefile b/graphics/eos-movrec/Makefile index 3633ebbfbf1a..a4a39ac625d4 100644 --- a/graphics/eos-movrec/Makefile +++ b/graphics/eos-movrec/Makefile @@ -7,6 +7,7 @@ PORTNAME= eos-movrec DISTVERSION= 0.3.1_beta +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3_beta @@ -24,6 +25,7 @@ QT_COMPONENTS= qmake_build moc_build rcc_build uic_build gui WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} DISTVERSIONSUFFIX= -src +PORTREVISION= 1 PLIST_FILES= bin/eos_movrec diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index 6769e1988be3..b5acfb7dfce2 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -7,7 +7,7 @@ PORTNAME= epdfview PORTVERSION= 0.1.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics print gnome MASTER_SITES= http://trac.emma-soft.com/epdfview/chrome/site/releases/ \ http://mirror.slitaz.org/sources/packages/e/ diff --git a/graphics/epix/Makefile b/graphics/epix/Makefile index c29240263186..6bba48f0ffee 100644 --- a/graphics/epix/Makefile +++ b/graphics/epix/Makefile @@ -8,6 +8,7 @@ PORTNAME= epix PORTVERSION= 1.2.10 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://mathcs.holycross.edu/~ahwang/epix/ diff --git a/graphics/eps2png/Makefile b/graphics/eps2png/Makefile index c5ca44798ec6..b5e766a444fd 100644 --- a/graphics/eps2png/Makefile +++ b/graphics/eps2png/Makefile @@ -7,7 +7,7 @@ PORTNAME= eps2png PORTVERSION= 2.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:JV diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile index 3d980a166b4c..8ce5a14f9f7f 100644 --- a/graphics/epstool/Makefile +++ b/graphics/epstool/Makefile @@ -7,7 +7,7 @@ PORTNAME= epstool PORTVERSION= 3.08 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_TEX_CTAN:S/$/:1/} \ ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/:2 diff --git a/graphics/ethumb/Makefile b/graphics/ethumb/Makefile index 82aca400ccac..2de31a02dd4c 100644 --- a/graphics/ethumb/Makefile +++ b/graphics/ethumb/Makefile @@ -7,7 +7,7 @@ PORTNAME= ethumb PORTVERSION= 0.1.1.56361 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics enlightenment MASTER_SITES= http://files.roorback.net/e17/2011-01-29/extra/ diff --git a/graphics/evas-loader-png/Makefile b/graphics/evas-loader-png/Makefile index 57c1c280f376..0fc83d46f930 100644 --- a/graphics/evas-loader-png/Makefile +++ b/graphics/evas-loader-png/Makefile @@ -7,6 +7,7 @@ PORTNAME= loader-png DISTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= graphics enlightenment MASTER_SITES= http://download.enlightenment.org/releases/ \ http://files.roorback.net/e17/2011-05-25/base/ @@ -16,7 +17,7 @@ DISTNAME= evas-${DISTVERSION} MAINTAINER= magik@roorback.net COMMENT= A hardware accelerated canvas API (PNG loader) -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 LICENSE= BSD diff --git a/graphics/evas-loader-svg/Makefile b/graphics/evas-loader-svg/Makefile index 35c395971a1d..c2f40be0549c 100644 --- a/graphics/evas-loader-svg/Makefile +++ b/graphics/evas-loader-svg/Makefile @@ -7,6 +7,7 @@ PORTNAME= loader-svg DISTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= graphics enlightenment MASTER_SITES= http://download.enlightenment.org/releases/ \ http://files.roorback.net/e17/2011-05-25/base/ diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile index 1450b8ab2665..96b37d8a46cb 100644 --- a/graphics/evas/Makefile +++ b/graphics/evas/Makefile @@ -7,6 +7,7 @@ PORTNAME= evas DISTVERSION= 1.0.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= graphics enlightenment MASTER_SITES= # none diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index d1756ab905de..a96df8f8bb19 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -8,7 +8,7 @@ PORTNAME= evince PORTVERSION= 2.32.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile index 2285e89e7046..a5ee2fc2da89 100644 --- a/graphics/evolvotron/Makefile +++ b/graphics/evolvotron/Makefile @@ -6,7 +6,7 @@ PORTNAME= evolvotron PORTVERSION= 0.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile index 972ad1ce4fe1..ae64f17c59da 100644 --- a/graphics/exact-image/Makefile +++ b/graphics/exact-image/Makefile @@ -7,6 +7,7 @@ PORTNAME= exact-image PORTVERSION= 0.8.7 +PORTREVISION= 1 CATEGORIES= graphics perl5 python MASTER_SITES= http://dl.exactcode.de/oss/${PORTNAME}/ LOCAL/bf @@ -19,7 +20,7 @@ BUILD_DEPENDS= swig>=1.3.32:${PORTSDIR}/devel/swig13 LIB_DEPENDS= agg.2:${PORTSDIR}/graphics/agg \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ gif.5:${PORTSDIR}/graphics/giflib \ jasper.4:${PORTSDIR}/graphics/jasper \ IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ @@ -30,7 +31,7 @@ LIB_DEPENDS= agg.2:${PORTSDIR}/graphics/agg \ CFLAGS+= -fPIC #hack to get custom exactcode configure script to enable tiff support with #broken headers on c++ in base system: -CPPFLAGS+= -fpermissive +CPPFLAGS+= -fpermissive -I${LOCALBASE}/include/libpng15 USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes diff --git a/graphics/exact-image/files/patch-codecs__png.cc b/graphics/exact-image/files/patch-codecs__png.cc index 06b835b25a95..a5fc65d2ad75 100644 --- a/graphics/exact-image/files/patch-codecs__png.cc +++ b/graphics/exact-image/files/patch-codecs__png.cc @@ -1,6 +1,15 @@ ---- codecs/png.cc.orig 2009-04-27 19:52:17.000000000 +0200 -+++ codecs/png.cc 2010-03-29 15:07:59.000000000 +0200 -@@ -71,7 +71,7 @@ +--- codecs/png.cc.orig 2010-03-03 22:04:44.000000000 +0100 ++++ codecs/png.cc 2012-04-25 19:08:13.000000000 +0200 +@@ -17,6 +17,8 @@ + + #include <stdlib.h> + #include <png.h> ++#include <zlib.h> ++#include <pngpriv.h> + + #include <iostream> + +@@ -71,7 +73,7 @@ /* Allocate/initialize the memory for image information. REQUIRED. */ info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { @@ -9,7 +18,7 @@ return 0; } -@@ -82,7 +82,7 @@ +@@ -82,7 +84,7 @@ if (setjmp(png_jmpbuf(png_ptr))) { /* Free all of the memory associated with the png_ptr and info_ptr */ @@ -18,7 +27,7 @@ /* If we get here, we had a problem reading the file */ return 0; } -@@ -99,7 +99,7 @@ +@@ -99,7 +101,7 @@ png_read_info (png_ptr, info_ptr); png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, @@ -27,7 +36,7 @@ image.w = width; image.h = height; -@@ -132,7 +132,7 @@ +@@ -132,7 +134,7 @@ #if 0 // no longer needed /* Expand grayscale images to the full 8 bits from 2, or 4 bits/pixel */ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth > 1 && bit_depth < 8) { @@ -36,7 +45,7 @@ image.bps = 8; } #endif -@@ -196,11 +196,11 @@ +@@ -196,11 +198,11 @@ for (int pass = 0; pass < number_passes; ++pass) for (unsigned int y = 0; y < height; ++y) { row_pointers[0] = image.getRawData() + y * stride; @@ -50,7 +59,7 @@ /* that's it */ return true; -@@ -224,7 +224,7 @@ +@@ -224,7 +226,7 @@ /* Allocate/initialize the memory for image information. REQUIRED. */ info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { @@ -59,7 +68,7 @@ return false; } -@@ -244,7 +244,6 @@ +@@ -244,7 +246,6 @@ else if (quality > Z_BEST_COMPRESSION) quality = Z_BEST_COMPRESSION; png_set_compression_level(png_ptr, quality); diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile index e44bf4480a2d..5e1afe4f13ad 100644 --- a/graphics/exrtools/Makefile +++ b/graphics/exrtools/Makefile @@ -7,7 +7,7 @@ PORTNAME= exrtools PORTVERSION= 0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://scanline.ca/exrtools/ \ CRITICAL @@ -18,7 +18,7 @@ COMMENT= Utilities for manipulating with HDR images in OpenEXR format LICENSE= GPLv2 LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes diff --git a/graphics/exrtools/files/patch-pngoutput.c b/graphics/exrtools/files/patch-pngoutput.c new file mode 100644 index 000000000000..b3dab36ac666 --- /dev/null +++ b/graphics/exrtools/files/patch-pngoutput.c @@ -0,0 +1,10 @@ +--- src/pngoutput.c.orig 2003-12-08 18:33:27.000000000 +0100 ++++ src/pngoutput.c 2012-04-25 06:41:11.000000000 +0200 +@@ -27,6 +27,7 @@ + #include <errno.h> + #include <string.h> + #include <png.h> ++#include <zlib.h> + #include "pngoutput.h" + + struct pngoutput_s diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile index 2b8f0f09de07..68b4bf18423b 100644 --- a/graphics/f-spot/Makefile +++ b/graphics/f-spot/Makefile @@ -7,6 +7,7 @@ PORTNAME= f-spot PORTVERSION= 0.8.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/graphics/fbm/Makefile b/graphics/fbm/Makefile index 7d32157fa216..edcbfee2e2a4 100644 --- a/graphics/fbm/Makefile +++ b/graphics/fbm/Makefile @@ -7,7 +7,7 @@ PORTNAME= fbm PORTVERSION= 1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/convert diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index d3cd2b134d2e..0c8a3647c69f 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -7,6 +7,7 @@ PORTNAME= feh PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://feh.finalrewind.org/ \ ${MASTER_SITE_LOCAL} diff --git a/graphics/figurine/Makefile b/graphics/figurine/Makefile index f7d16c4904ce..3c3299b32b61 100644 --- a/graphics/figurine/Makefile +++ b/graphics/figurine/Makefile @@ -7,7 +7,7 @@ PORTNAME= figurine PORTVERSION= 1.0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/flam3/Makefile b/graphics/flam3/Makefile index 102fdd7b0886..115ea8957985 100644 --- a/graphics/flam3/Makefile +++ b/graphics/flam3/Makefile @@ -7,7 +7,7 @@ PORTNAME= flam3 PORTVERSION= 2.7.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://flam3.com/ \ http://interwebfun.org/distfiles/ @@ -15,7 +15,7 @@ MASTER_SITES= http://flam3.com/ \ MAINTAINER= john.c.prather@gmail.com COMMENT= A Flame Renderer -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ xml2.5:${PORTSDIR}/textproc/libxml2 \ jpeg.11:${PORTSDIR}/graphics/jpeg @@ -27,5 +27,6 @@ USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include/libpng15 .include <bsd.port.mk> diff --git a/graphics/flam3/files/patch-png.c b/graphics/flam3/files/patch-png.c new file mode 100644 index 000000000000..fa5a620a4b31 --- /dev/null +++ b/graphics/flam3/files/patch-png.c @@ -0,0 +1,10 @@ +--- png.c.orig 2008-11-12 02:39:40.000000000 +0100 ++++ png.c 2012-04-25 06:46:07.000000000 +0200 +@@ -21,6 +21,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <png.h> ++#include <pngpriv.h> + #include <setjmp.h> + + #include "config.h" diff --git a/graphics/flip/Makefile b/graphics/flip/Makefile index 80dc2da704ad..1eb3dcb9df58 100644 --- a/graphics/flip/Makefile +++ b/graphics/flip/Makefile @@ -8,7 +8,7 @@ PORTNAME= flip PORTVERSION= 2.3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://www.reptilelabour.com/software/files/flip/ diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile index 8aad91394d27..cff13cb3ba67 100644 --- a/graphics/flphoto/Makefile +++ b/graphics/flphoto/Makefile @@ -7,7 +7,7 @@ PORTNAME= flphoto PORTVERSION= 1.3.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/fltk/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -16,11 +16,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A basic image management and display program LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \ - fltk.1:${PORTSDIR}/x11-toolkits/fltk + fltk.1:${PORTSDIR}/x11-toolkits/fltk \ + png15:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes +USE_XORG= xinerama GNU_CONFIGURE= yes MAN1= flphoto.1 diff --git a/graphics/flphoto/files/patch-image.cxx b/graphics/flphoto/files/patch-image.cxx new file mode 100644 index 000000000000..ad2b8d472e83 --- /dev/null +++ b/graphics/flphoto/files/patch-image.cxx @@ -0,0 +1,10 @@ +--- image.cxx.orig 2006-11-18 14:56:11.000000000 +0100 ++++ image.cxx 2012-05-09 12:28:28.000000000 +0200 +@@ -92,6 +92,7 @@ + + #ifdef HAVE_LIBPNG + # include <png.h> ++# include <zlib.h> + #endif // HAVE_LIBPNG + + diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index fc594e3110e3..a226d82feb70 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -7,7 +7,7 @@ PORTNAME= fly PORTVERSION= 2.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://fossies.org/unix/www/ \ http://martin.gleeson.com/fly/dist/ diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index ffba0f853228..a779492eb0ec 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -7,7 +7,7 @@ PORTNAME= fnlib PORTVERSION= 0.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= SF/enlightenment/OldFiles diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index 3f3b0da2f6ac..37392f7be1da 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -7,6 +7,7 @@ PORTNAME= fotoxx PORTVERSION= 11.03 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://kornelix.squarespace.com/downloads/ \ http://www.rodperson.com/DL/ diff --git a/graphics/fpc-cairo/Makefile b/graphics/fpc-cairo/Makefile index ac619e63dbf9..bb6a1421ebf2 100644 --- a/graphics/fpc-cairo/Makefile +++ b/graphics/fpc-cairo/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics lang PKGNAMESUFFIX= -cairo diff --git a/graphics/fpc-fpvectorial/Makefile b/graphics/fpc-fpvectorial/Makefile index d403d8130cbd..471328fc0ff0 100644 --- a/graphics/fpc-fpvectorial/Makefile +++ b/graphics/fpc-fpvectorial/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics lang PKGNAMESUFFIX= -fpvectorial diff --git a/graphics/fpc-graph/Makefile b/graphics/fpc-graph/Makefile index a663a7cf6436..19403ab8f5de 100644 --- a/graphics/fpc-graph/Makefile +++ b/graphics/fpc-graph/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics lang PKGNAMESUFFIX= -graph diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile index af5f0057b928..0f18f36888e5 100644 --- a/graphics/fpc-imagemagick/Makefile +++ b/graphics/fpc-imagemagick/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics lang PKGNAMESUFFIX= -imagemagick diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile index e930cb3a1c42..7bce131d5a71 100644 --- a/graphics/fpc-libgd/Makefile +++ b/graphics/fpc-libgd/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics lang PKGNAMESUFFIX= -libgd diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile index b9b2f7a8e4b8..85b3df6c972a 100644 --- a/graphics/fpc-libpng/Makefile +++ b/graphics/fpc-libpng/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics lang PKGNAMESUFFIX= -libpng diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile index 6bbc766d3ac4..6059b9d47eb9 100644 --- a/graphics/fpc-rsvg/Makefile +++ b/graphics/fpc-rsvg/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics lang PKGNAMESUFFIX= -rsvg diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile index 2a40c1df2dd5..0931eeea8025 100644 --- a/graphics/fracplanet/Makefile +++ b/graphics/fracplanet/Makefile @@ -7,7 +7,7 @@ PORTNAME= fracplanet PORTVERSION= 0.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/fractorama/Makefile b/graphics/fractorama/Makefile index a895311b6705..32aee242571a 100644 --- a/graphics/fractorama/Makefile +++ b/graphics/fractorama/Makefile @@ -7,7 +7,7 @@ PORTNAME= fractorama PORTVERSION= 1.6.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= CRITICAL MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile index 37610e028831..e0fba2ded3c0 100644 --- a/graphics/fraqtive/Makefile +++ b/graphics/fraqtive/Makefile @@ -7,7 +7,7 @@ PORTNAME= fraqtive PORTVERSION= 0.4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/fraqtive/Fraqtive/Fraqtive%20${PORTVERSION}/ diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile index abae0cab5ad1..bc7736640626 100644 --- a/graphics/frei0r/Makefile +++ b/graphics/frei0r/Makefile @@ -32,13 +32,13 @@ IGNORE= cannot build OpenCV and gavl plugins simultaneously .endif .if defined(BUILDING_FREI0R_OPENCV) -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Frei0r OpenCV plugins PKGNAMESUFFIX= -plugins-opencv LIB_DEPENDS+= opencv_legacy.2:${PORTSDIR}/graphics/opencv FREI0R_PLUGINS= facebl0r facedetect .elif defined(BUILDING_FREI0R_GAVL) -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Frei0r gavl plugins PKGNAMESUFFIX= -plugins-gavl LIB_DEPENDS+= gavl.1:${PORTSDIR}/multimedia/gavl diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile index 246b1fbbf771..3ca2dc8b28b6 100644 --- a/graphics/frontline/Makefile +++ b/graphics/frontline/Makefile @@ -7,7 +7,7 @@ PORTNAME= frontline PORTVERSION= 0.5.4 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics gnome MASTER_SITES= SF/autotrace/FrontLine/${PORTVERSION} diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile index 8ace7afb3c43..a18539fe939d 100644 --- a/graphics/fv/Makefile +++ b/graphics/fv/Makefile @@ -7,6 +7,7 @@ PORTNAME= fv PORTVERSION= 1.03 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.eaflux.com/fv/sources/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} @@ -16,7 +17,7 @@ COMMENT= A viewer of hdr/pfm images LICENSE= GPLv2 -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_ZIP= yes USE_GL= glut @@ -25,9 +26,9 @@ USE_GMAKE= yes ALL_TARGET= ${PORTNAME} MAKE_JOBS_SAFE= yes -CXXFLAGS+= $$(pkg-config --cflags libpng14) \ +CXXFLAGS+= $$(pkg-config --cflags libpng15) \ -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= $$(pkg-config --libs libpng14) \ +LDFLAGS+= $$(pkg-config --libs libpng15) \ -L${LOCALBASE}/lib -lglut -lGLU -lGL -lbz2 -lm ${PTHREAD_LIBS} PORTDOCS= AUTHORS ChangeLog README diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile index 080d36722a8b..da44f6834684 100644 --- a/graphics/fyre/Makefile +++ b/graphics/fyre/Makefile @@ -7,6 +7,7 @@ PORTNAME= fyre PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://releases.navi.cx/fyre/ diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile index ae194aa0ce49..7412a548909b 100644 --- a/graphics/g2/Makefile +++ b/graphics/g2/Makefile @@ -7,7 +7,7 @@ PORTNAME= g2 PORTVERSION= 0.40 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= libs/graphics diff --git a/graphics/gcolor2/Makefile b/graphics/gcolor2/Makefile index 6a3f4f978f41..96f00a512987 100644 --- a/graphics/gcolor2/Makefile +++ b/graphics/gcolor2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gcolor2 PORTVERSION= 0.4 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics gnome MASTER_SITES= SF diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 1f30c8644f94..7abb796badad 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -7,7 +7,7 @@ PORTNAME= gd PORTVERSION= 2.0.35 -PORTREVISION?= 7 +PORTREVISION?= 8 PORTEPOCH= 1 CATEGORIES+= graphics MASTER_SITES= http://www.libgd.org/releases/ \ @@ -19,7 +19,7 @@ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= A graphics library for fast creation of images LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 CONFLICTS= bazaar-1.* diff --git a/graphics/gdal-grass/Makefile b/graphics/gdal-grass/Makefile index 3a73d0031260..70a7d5b38e11 100644 --- a/graphics/gdal-grass/Makefile +++ b/graphics/gdal-grass/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdal-grass PORTVERSION= 1.4.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://download.osgeo.org/gdal/ diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index c361a453c45d..f35e80f6baa4 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -7,6 +7,7 @@ PORTNAME= gdal PORTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= http://download.osgeo.org/gdal/ \ ftp://ftp.remotesensing.org/pub/gdal/ \ @@ -183,7 +184,7 @@ CONFIGURE_ARGS+=--with-php .endif .if !defined(WITHOUT_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+= --with-png=${LOCALBASE} .endif diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile index 3682d9827bbd..4370a5703fd3 100644 --- a/graphics/gdchart/Makefile +++ b/graphics/gdchart/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdchart PORTVERSION= 0.11.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://www.fred.net/brv/chart/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index 5f538988e7c3..d7fe1c7dd517 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -7,7 +7,7 @@ PORTNAME?= gdk-pixbuf PORTVERSION= 0.22.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES?= graphics MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.22 @@ -17,7 +17,7 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT?= A graphic library for GTK+ -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.11:${PORTSDIR}/graphics/jpeg diff --git a/graphics/gdk-pixbuf/files/patch-io-png.c b/graphics/gdk-pixbuf/files/patch-io-png.c new file mode 100644 index 000000000000..1c54d8b77770 --- /dev/null +++ b/graphics/gdk-pixbuf/files/patch-io-png.c @@ -0,0 +1,29 @@ +--- gdk-pixbuf/io-png.c.orig 2001-01-24 21:59:23.000000000 +0100 ++++ gdk-pixbuf/io-png.c 2012-04-24 22:50:30.000000000 +0200 +@@ -175,7 +175,7 @@ + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); + return NULL; + } +@@ -311,7 +311,7 @@ + return NULL; + } + +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + if (lc->png_info_ptr) + png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); + g_free(lc); +@@ -366,7 +366,7 @@ + lc->max_row_seen_in_chunk = -1; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + return FALSE; + } else { + png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size); diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index f0229354ce89..73a127b0a42b 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -7,7 +7,7 @@ PORTNAME?= gdk-pixbuf PORTVERSION= 2.23.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= graphics MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gdk-pixbuf/${PORTVERSION:R} @@ -64,7 +64,7 @@ PLIST_SUB+= JPEG="@comment " .endif .if !defined(WITHOUT_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png PLIST_SUB+= PNG="" .else CONFIGURE_ARGS+=--without-libpng diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile index 1fbc76607233..15b1d7b95277 100644 --- a/graphics/gdtclft/Makefile +++ b/graphics/gdtclft/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gdtclft PORTVERSION= 2.2.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics tcl MASTER_SITES= http://www.graphviz.org/pub/ DISTNAME= ${PORTNAME}${PORTVERSION} diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index 487549f81830..ce7d2838ccc8 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -7,14 +7,14 @@ PORTNAME= geeqie PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Lightweight image viewer forked from GQview -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_GNOME= gtk20 desktopfileutils GNU_CONFIGURE= yes diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index d9e5911c2c3b..89a0f93d1153 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -7,7 +7,7 @@ PORTNAME= gegl PORTVERSION= 0.1.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/gegl/0.1/ @@ -152,7 +152,7 @@ CONFIGURE_ARGS+=--disable-mmx \ .endif .if !defined(WITHOUT_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png PLIST_SUB+= PNG="" .else CONFIGURE_ARGS+=--without-libpng diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile index 65cea0b6f9ac..7f7935c725c1 100644 --- a/graphics/geomorph/Makefile +++ b/graphics/geomorph/Makefile @@ -7,7 +7,7 @@ PORTNAME= geomorph PORTVERSION= 0.50 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF EXTRACT_SUFX= .tgz @@ -15,7 +15,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= amdmi3@FreeBSD.org COMMENT= Height field generator and editor -LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext +LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \ + png15:${PORTSDIR}/graphics/png USE_GL= yes USE_GMAKE= yes @@ -39,7 +40,7 @@ CFLAGS+= -O0 .endif post-patch: - @${REINPLACE_CMD} -e 's|libpng|libpng14|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|libpng|libpng15|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local/share/geomorph/GeoMorph.xpm|geomorph.xpm|' \ ${WRKSRC}/geomorph.desktop @${FIND} ${WRKSRC} -exec ${GREP} -q /usr/local/share/geomorph {} \; -print | \ diff --git a/graphics/geomorph/files/patch-src-utils-writepng.c b/graphics/geomorph/files/patch-src-utils-writepng.c new file mode 100644 index 000000000000..b4a0e142681a --- /dev/null +++ b/graphics/geomorph/files/patch-src-utils-writepng.c @@ -0,0 +1,19 @@ +--- src/utils/writepng.c.orig 2008-01-23 03:14:22.000000000 +0100 ++++ src/utils/writepng.c 2012-05-04 12:28:50.000000000 +0200 +@@ -20,6 +20,7 @@ + */ + + #include <png.h> ++#include <zlib.h> + #include <stdlib.h> + #include "./utils.h" + +@@ -75,7 +76,7 @@ + + /* Set error handling. */ + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem writing the file */ + fclose(fp); diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile index 916b66089064..fc60403999f1 100644 --- a/graphics/giblib/Makefile +++ b/graphics/giblib/Makefile @@ -7,7 +7,7 @@ PORTNAME= giblib PORTVERSION= 1.2.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics devel MASTER_SITES= http://linuxbrit.co.uk/downloads/ diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile index acfb62ffc034..82f549f4939e 100644 --- a/graphics/gif2png/Makefile +++ b/graphics/gif2png/Makefile @@ -7,13 +7,14 @@ PORTNAME= gif2png PORTVERSION= 2.5.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.catb.org/~esr/gif2png/ MAINTAINER= saper@saper.info COMMENT= Converts GIF images to a PNG format -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_PYTHON_RUN= yes GNU_CONFIGURE= yes diff --git a/graphics/gif2png/files/patch-gif2png.h b/graphics/gif2png/files/patch-gif2png.h new file mode 100644 index 000000000000..bcb02608a70b --- /dev/null +++ b/graphics/gif2png/files/patch-gif2png.h @@ -0,0 +1,11 @@ +--- gif2png.h.orig 2010-10-20 00:11:28.000000000 +0200 ++++ gif2png.h 2012-04-25 06:50:10.000000000 +0200 +@@ -2,6 +2,8 @@ + + /* get png type definitions */ + #include "png.h" ++#include "pngpriv.h" ++#include "zlib.h" + + #define GIFterminator ';' + #define GIFextension '!' diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index ffedf411a40d..70aee8d00d0d 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -7,14 +7,15 @@ PORTNAME= gimageview PORTVERSION= 0.2.27 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= SF/gtkmmviewer/${PORTNAME}/${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= Yet another GTK+ based image viewer -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ + png15:${PORTSDIR}/graphics/png USE_GMAKE= yes WANT_GNOME= yes diff --git a/graphics/gimageview/files/patch-png_loader.c b/graphics/gimageview/files/patch-png_loader.c new file mode 100644 index 000000000000..79ad00553117 --- /dev/null +++ b/graphics/gimageview/files/patch-png_loader.c @@ -0,0 +1,11 @@ +--- plugins/image_loader/png_loader.c.orig 2004-05-23 16:08:16.000000000 +0200 ++++ plugins/image_loader/png_loader.c 2012-05-09 12:30:01.000000000 +0200 +@@ -255,7 +255,7 @@ + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) goto ERROR; ++ if (setjmp (png_jmpbuf(png_ptr))) goto ERROR; + + context.gio = gio; + context.bytes_read = 0; diff --git a/graphics/gimageview/files/patch-png_saver.c b/graphics/gimageview/files/patch-png_saver.c new file mode 100644 index 000000000000..960992e1b04a --- /dev/null +++ b/graphics/gimageview/files/patch-png_saver.c @@ -0,0 +1,11 @@ +--- plugins/image_saver/png_saver.c.orig 2004-05-23 16:08:11.000000000 +0200 ++++ plugins/image_saver/png_saver.c 2012-05-11 17:57:12.000000000 +0200 +@@ -130,7 +130,7 @@ + return FALSE; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_write_struct (&png_ptr, &info_ptr); + fclose (handle); + return FALSE; diff --git a/graphics/gimmage/Makefile b/graphics/gimmage/Makefile index b52f65810f0e..c5341864990e 100644 --- a/graphics/gimmage/Makefile +++ b/graphics/gimmage/Makefile @@ -7,7 +7,7 @@ PORTNAME= gimmage PORTVERSION= 0.2.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= BERLIOS CENKES diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index ca7197708b0e..8a15942683b3 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -8,7 +8,7 @@ PORTNAME= gimp-app DISTVERSION= 2.6.12 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -25,7 +25,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A GNU Image Manipulation Program BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ lcms.1:${PORTSDIR}/graphics/lcms \ @@ -194,7 +194,7 @@ post-patch: ${WRKSRC}/plug-ins/pygimp/Makefile.in @${REINPLACE_CMD} -e 's/-u /-Wl,-u,/' \ ${WRKSRC}/app/Makefile.in - @${REINPLACE_CMD} -e 's|"libpng"|"libpng14"|' \ + @${REINPLACE_CMD} -e 's|"libpng"|"libpng15"|' \ -e 's|x86_64|amd64|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} '/curl.types.h/d' ${WRKSRC}/plug-ins/file-uri/uri-backend-libcurl.c diff --git a/graphics/gimp-data-extras/Makefile b/graphics/gimp-data-extras/Makefile index 295827f1530d..ef04f989e5fd 100644 --- a/graphics/gimp-data-extras/Makefile +++ b/graphics/gimp-data-extras/Makefile @@ -7,7 +7,7 @@ PORTNAME= gimp-data-extras PORTVERSION= 2.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ http://gimp.mirrors.hoobly.com/%SUBDIR%/ \ diff --git a/graphics/gimp-focusblur-plugin/Makefile b/graphics/gimp-focusblur-plugin/Makefile index d884f1f19c60..a4ea08a49654 100644 --- a/graphics/gimp-focusblur-plugin/Makefile +++ b/graphics/gimp-focusblur-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= focusblur PORTVERSION= 3.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://registry.gimp.org/files/ PKGNAMEPREFIX= gimp- diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile index e3cf5208d8e5..b5eb5892bf03 100644 --- a/graphics/gimp-gmic-plugin/Makefile +++ b/graphics/gimp-gmic-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmic PORTVERSION= 1.5.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/old diff --git a/graphics/gimp-lqr-plugin/Makefile b/graphics/gimp-lqr-plugin/Makefile index 411f580f1df4..ec7476339c98 100644 --- a/graphics/gimp-lqr-plugin/Makefile +++ b/graphics/gimp-lqr-plugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= gimp-lqr-plugin PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://liquidrescale.wdfiles.com/local--files/en:download-page-sources/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile index ae4e8111ce29..2a836c5db6cf 100644 --- a/graphics/gimp-resynthesizer/Makefile +++ b/graphics/gimp-resynthesizer/Makefile @@ -7,7 +7,7 @@ PORTNAME= resynthesizer PORTVERSION= 0.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.logarithmic.net/pfh-files/resynthesizer/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/gimp-save-for-web/Makefile b/graphics/gimp-save-for-web/Makefile index d0dba7767292..6683f02f23f6 100644 --- a/graphics/gimp-save-for-web/Makefile +++ b/graphics/gimp-save-for-web/Makefile @@ -7,6 +7,7 @@ PORTNAME= gimp-save-for-web PORTVERSION= 0.29.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://registry.gimp.org/files/ diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 4e86714cde05..0cab7aecd45b 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -7,7 +7,7 @@ PORTNAME= giram PORTVERSION= 0.3.5 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics MASTER_SITES= http://freebsd.nsu.ru/distfiles/ diff --git a/graphics/gkrellkam/Makefile b/graphics/gkrellkam/Makefile index 69bf135e75af..f35c780f1004 100644 --- a/graphics/gkrellkam/Makefile +++ b/graphics/gkrellkam/Makefile @@ -7,7 +7,7 @@ PORTNAME= gkrellkam PORTVERSION= 0.3.4 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile index 8f906ec62fce..9c696444cb94 100644 --- a/graphics/gkrellkam2/Makefile +++ b/graphics/gkrellkam2/Makefile @@ -8,7 +8,7 @@ PORTNAME= gkrellkam PORTVERSION= 2.0.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile index 44888bd91d06..5537303caeb6 100644 --- a/graphics/gle-graphics/Makefile +++ b/graphics/gle-graphics/Makefile @@ -7,7 +7,7 @@ PORTNAME= gle-graphics PORTVERSION= 4.0.12 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics print MASTER_SITES= SF/glx/gle4%20%28Current%20Active%20Version%29/${PORTVERSION} DISTNAME= GLE-${PORTVERSION}-src @@ -40,7 +40,7 @@ post-patch: .if !defined(WITHOUT_BITMAP_IMAGES) LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiffxx.4:${PORTSDIR}/graphics/tiff CONFIGURE_ARGS+= --with-jpeg=${LOCALBASE} --with-tiff=${LOCALBASE} --with-png=${LOCALBASE} .else diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile index d42917177d1c..6ba46b9a711a 100644 --- a/graphics/gliv/Makefile +++ b/graphics/gliv/Makefile @@ -7,6 +7,7 @@ PORTNAME= gliv PORTVERSION= 1.9.7 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://guichaz.free.fr/gliv/files/ diff --git a/graphics/glosm/Makefile b/graphics/glosm/Makefile index 4a41f79d7b71..2381b5cccb31 100644 --- a/graphics/glosm/Makefile +++ b/graphics/glosm/Makefile @@ -7,7 +7,7 @@ PORTNAME= glosm PORTVERSION= 0.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MASTER_SITES= http://cloud.github.com/downloads/AMDmi3/glosm/ \ http://mirror.amdmi3.ru/distfiles/ @@ -15,7 +15,7 @@ MASTER_SITES= http://cloud.github.com/downloads/AMDmi3/glosm/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= 3D OpenGL renderer for OpenStreetMap -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ expat.6:${PORTSDIR}/textproc/expat2 USE_BZIP2= yes diff --git a/graphics/glpng/Makefile b/graphics/glpng/Makefile index 2de93e1a95d1..0cf952ac6980 100644 --- a/graphics/glpng/Makefile +++ b/graphics/glpng/Makefile @@ -7,7 +7,7 @@ PORTNAME= glpng PORTVERSION= 1.45 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.wyatt100.freeserve.co.uk/ \ http://mirror.amdmi3.ru/distfiles/ @@ -16,7 +16,7 @@ DISTNAME= glpng MAINTAINER= amdmi3@FreeBSD.org COMMENT= Library to easily load PNG files as an OpenGL textures -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_GL= gl USE_ZIP= yes @@ -26,11 +26,6 @@ AR?= /usr/bin/ar WRKSRC= ${WRKDIR}/src -post-patch: - @${REINPLACE_CMD} -e 's|png/|libpng/|' \ - -e 's|!png_check_sig(header, 8)|png_sig_cmp(header, 0, 8)|' \ - ${WRKSRC}/glpng.c - do-build: ${CC} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${WRKDIR}/include -c -o ${WRKSRC}/libglpng.o ${WRKSRC}/glpng.c ${CC} ${CFLAGS} -fPIC -L${LOCALBASE}/lib -shared -lGL -lpng -lz -lm -o ${WRKSRC}/libglpng.so.1 ${WRKSRC}/libglpng.o diff --git a/graphics/glpng/files/patch-glpng.c b/graphics/glpng/files/patch-glpng.c new file mode 100644 index 000000000000..5a74cc264149 --- /dev/null +++ b/graphics/glpng/files/patch-glpng.c @@ -0,0 +1,49 @@ +--- glpng.c.orig 2000-07-10 21:27:10.000000000 +0200 ++++ glpng.c 2012-04-27 08:58:12.000000000 +0200 +@@ -25,11 +25,11 @@ + #include <windows.h> + #endif + ++#include "png.h" + #include <GL/glpng.h> + #include <GL/gl.h>
+ #include <stdlib.h> + #include <math.h> +-#include "png/png.h" +
+ /* Used to decide if GL/gl.h supports the paletted extension */
+ #ifdef GL_COLOR_INDEX1_EXT
+@@ -269,14 +269,14 @@ + if (pinfo == NULL) return 0; + + fread(header, 1, 8, fp); +- if (!png_check_sig(header, 8)) return 0; ++ if (png_sig_cmp(header, 0, 8)) return 0; + + png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + info = png_create_info_struct(png); + endinfo = png_create_info_struct(png); + + // DH: added following lines
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ png_destroy_read_struct(&png, &info, &endinfo);
+ return 0;
+@@ -373,14 +373,14 @@ + png_uint_32 i; + + fread(header, 1, 8, fp); +- if (!png_check_sig(header, 8)) return 0; ++ if (png_sig_cmp(header, 0, 8)) return 0; + + png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + info = png_create_info_struct(png); + endinfo = png_create_info_struct(png); + + // DH: added following lines
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ png_destroy_read_struct(&png, &info, &endinfo);
+ return 0;
diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile index c377c6d89790..787578966380 100644 --- a/graphics/gmt/Makefile +++ b/graphics/gmt/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmt PORTVERSION= 4.5.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://falcon.grdl.noaa.gov/pub/${PORTNAME}/ \ ftp://ftp.soest.hawaii.edu/${PORTNAME}/ \ diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 7d1a211f1de4..e9ffa3c7c2d7 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnash PORTVERSION= 0.8.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile index c361664af0a5..588bde415b2c 100644 --- a/graphics/gnofract4d/Makefile +++ b/graphics/gnofract4d/Makefile @@ -7,23 +7,24 @@ PORTNAME= gnofract4d PORTVERSION= 3.14 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= SF MAINTAINER= sylvio@FreeBSD.org COMMENT= Weird GNOME fractal generator -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ + png15:${PORTSDIR}/graphics/png LICENSE= BSD -BROKEN= does not compile - USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui lthack \ pygtk2 USE_PYTHON= yes USE_PYDISTUTILS=yes +CFLAGS+= -I${LOCALBASE}/include PORTDOCS= README COPYING INSTALLS_EGGINFO= yes PYDISTUTILS_EGGINFODIR= ${PYTHON_SITELIBDIR} @@ -49,7 +50,7 @@ post-patch: @${REINPLACE_CMD} -e '249,251d' ${WRKSRC}/setup.py # fixup library detection - @${REINPLACE_CMD} -e "s/libpng/libpng14/" ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e "s/libpng/libpng15/" ${WRKSRC}/setup.py @${REINPLACE_CMD} \ -e "s,/usr/include/jpeglib.h,${LOCALBASE}/include/jpeglib.h," \ ${WRKSRC}/setup.py diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile index 5aab641c9512..90352a7b7444 100644 --- a/graphics/gnomeiconedit/Makefile +++ b/graphics/gnomeiconedit/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomeiconedit PORTVERSION= 1.2.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics gnome MASTER_SITES= SF/giconedit/giconedit-${PORTVERSION}/tar.gz DISTNAME= gnome-iconedit-${PORTVERSION} @@ -15,6 +15,8 @@ DISTNAME= gnome-iconedit-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A small GNOME Icon Editor +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png + USE_GNOME= gnomeprefix gnomehack bonobo gnomeprint USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/gnomeiconedit/files/patch-io.c b/graphics/gnomeiconedit/files/patch-io.c new file mode 100644 index 000000000000..f1bd243ace64 --- /dev/null +++ b/graphics/gnomeiconedit/files/patch-io.c @@ -0,0 +1,11 @@ +--- src/io.c.orig 2000-06-22 17:24:20.000000000 +0200 ++++ src/io.c 2012-05-22 07:40:49.000000000 +0200 +@@ -294,7 +294,7 @@ + return FALSE; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + GtkWidget *errorbox; + + /* Error handler */ diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile index c174b5922a83..c0df6e0215d8 100644 --- a/graphics/gocr/Makefile +++ b/graphics/gocr/Makefile @@ -7,6 +7,7 @@ PORTNAME= gocr PORTVERSION= 0.49 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www-e.uni-magdeburg.de/jschulen/ocr/ diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile index 66d5e97355cb..832ab4a42865 100644 --- a/graphics/goocanvas/Makefile +++ b/graphics/goocanvas/Makefile @@ -7,7 +7,7 @@ PORTNAME= goocanvas PORTVERSION= 0.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= GNOME diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile index fe7c35ac8da7..1a82c1c5bb05 100644 --- a/graphics/goocanvasmm/Makefile +++ b/graphics/goocanvasmm/Makefile @@ -7,6 +7,7 @@ PORTNAME= goocanvasmm PORTVERSION= 0.15.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GNOME diff --git a/graphics/gource/Makefile b/graphics/gource/Makefile index 5423eeeb25cd..c4776e9d8816 100644 --- a/graphics/gource/Makefile +++ b/graphics/gource/Makefile @@ -7,6 +7,7 @@ PORTNAME= gource PORTVERSION= 0.32 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/gozer/Makefile b/graphics/gozer/Makefile index 33c8d07344cb..c9a3b2cd0b2c 100644 --- a/graphics/gozer/Makefile +++ b/graphics/gozer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gozer PORTVERSION= 0.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://linuxbrit.co.uk/downloads/ diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile index b1214c1f4874..05f678eed632 100644 --- a/graphics/gpaint/Makefile +++ b/graphics/gpaint/Makefile @@ -8,7 +8,7 @@ PORTNAME= gpaint PORTVERSION= 0.3.3 DISTVERSIONPREFIX= 2- -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNU_ALPHA} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile index d9d521596852..cbcbf8ea3711 100644 --- a/graphics/gpicview/Makefile +++ b/graphics/gpicview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gpicview PORTVERSION= 0.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/lxde/GPicView%20%28image%20Viewer%29/GPicView%20${PORTVERSION} diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile index 579491552213..c2280ee5c3ba 100644 --- a/graphics/gqview-devel/Makefile +++ b/graphics/gqview-devel/Makefile @@ -7,14 +7,14 @@ PORTNAME= gqview PORTVERSION= 2.1.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/unstable/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= Another gtk2-based graphic file viewer -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_GNOME= gnomehier gtk20 GNU_CONFIGURE= yes diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index 20396ef9e529..181328124dfd 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -7,14 +7,14 @@ PORTNAME= gqview PORTVERSION= 2.0.4 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= lme@FreeBSD.org COMMENT= Another gtk2-based graphic file viewer -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_GNOME= gnomehier gtk20 GNU_CONFIGURE= yes diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile index 7e4ba4a800f0..979010ee18dc 100644 --- a/graphics/grads/Makefile +++ b/graphics/grads/Makefile @@ -7,7 +7,7 @@ PORTNAME= grads PORTVERSION= 1.9b4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics science math MASTER_SITES= ftp://grads.iges.org/grads/1.9/:src \ ftp://grads.iges.org/grads/:other @@ -22,7 +22,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libudunits2.a:${PORTSDIR}/science/udunits \ ${LOCALBASE}/lib/libsx.a:${PORTSDIR}/x11/libsx LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes CONFIGURE_ENV+= SUPPLIBS="${LOCALBASE}" diff --git a/graphics/grafx2/Makefile b/graphics/grafx2/Makefile index 096ef61004de..366c281961cd 100644 --- a/graphics/grafx2/Makefile +++ b/graphics/grafx2/Makefile @@ -7,7 +7,7 @@ PORTNAME= grafx2 PORTVERSION= 2.3.1781 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}/src CFLAGS+= -DHAVE_SYS_PARAM_H -DHAVE_SYS_UCRED_H -DHAVE_SYS_MOUNT_H LIB_DEPENDS= X11:${PORTSDIR}/x11/libX11 \ - png:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png .include <bsd.port.pre.mk> diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 3b0ac826b2da..aaee48e9e27a 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -7,6 +7,7 @@ PORTNAME= graphviz PORTVERSION= 2.28.0 +PORTREVISION= 1 CATEGORIES= graphics tk MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ @@ -14,7 +15,7 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= Graph Visualization Software from AT&T and Bell Labs LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ expat.6:${PORTSDIR}/textproc/expat2 \ diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile index e0eceb7e7a1f..2ee4580f1280 100644 --- a/graphics/grx/Makefile +++ b/graphics/grx/Makefile @@ -7,6 +7,7 @@ PORTNAME= grx PORTVERSION= 2.4.8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://grx.gnu.de/download/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} @@ -59,7 +60,7 @@ CONFIGURE_ARGS+=--disable-jpeg .endif .if defined(WITH_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+=--enable-png .else CONFIGURE_ARGS+=--disable-png diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile index cc4c2268e927..8eee6ae74057 100644 --- a/graphics/gscan2pdf/Makefile +++ b/graphics/gscan2pdf/Makefile @@ -7,6 +7,7 @@ PORTNAME= gscan2pdf PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile index d9723048444f..b07f28026c72 100644 --- a/graphics/gsculpt/Makefile +++ b/graphics/gsculpt/Makefile @@ -8,6 +8,7 @@ PORTNAME= gsculpt PORTVERSION= 0.99.47 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME:S,-src,,} DISTNAME= gSculpt-${PORTVERSION}-alpha-src diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile index 7ee8e56d2a6e..1c164f879f47 100644 --- a/graphics/gsnapshot/Makefile +++ b/graphics/gsnapshot/Makefile @@ -7,7 +7,7 @@ PORTNAME= gsnapshot PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/gould/${PORTNAME}/release%20${PORTVERSION} diff --git a/graphics/gstreamer-plugins-cairo/Makefile b/graphics/gstreamer-plugins-cairo/Makefile index f9ec2a574507..7f355a036c7e 100644 --- a/graphics/gstreamer-plugins-cairo/Makefile +++ b/graphics/gstreamer-plugins-cairo/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.6 2008/03/19 14:05:34 ahze Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= Gstreamer vector graphics plugin diff --git a/graphics/gstreamer-plugins-gdkpixbuf/Makefile b/graphics/gstreamer-plugins-gdkpixbuf/Makefile index f124f1982f4d..24601644918e 100644 --- a/graphics/gstreamer-plugins-gdkpixbuf/Makefile +++ b/graphics/gstreamer-plugins-gdkpixbuf/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/graphics/gstreamer-plugins-gdkpixbuf/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= Gstreamer image decoder plugin diff --git a/graphics/gstreamer-plugins-gl/Makefile b/graphics/gstreamer-plugins-gl/Makefile index b1ecaafbab66..b004db76e981 100644 --- a/graphics/gstreamer-plugins-gl/Makefile +++ b/graphics/gstreamer-plugins-gl/Makefile @@ -7,6 +7,7 @@ PORTNAME= gstreamer-plugins-gl PORTVERSION= 0.10.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-gl/ DISTNAME= ${PORTNAME:S/gstreamer/gst/}-${PORTVERSION} @@ -14,7 +15,7 @@ DISTNAME= ${PORTNAME:S/gstreamer/gst/}-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer OpenGL video plugin -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes diff --git a/graphics/gstreamer-plugins-libcaca/Makefile b/graphics/gstreamer-plugins-libcaca/Makefile index 847abc85da42..efbf8fa03ccd 100644 --- a/graphics/gstreamer-plugins-libcaca/Makefile +++ b/graphics/gstreamer-plugins-libcaca/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/graphics/gstreamer-plugins-libcaca/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= Gstreamer color ascii art plugin diff --git a/graphics/gstreamer-plugins-libpng/Makefile b/graphics/gstreamer-plugins-libpng/Makefile index 50367404bc5f..dd8c0e3ceb0a 100644 --- a/graphics/gstreamer-plugins-libpng/Makefile +++ b/graphics/gstreamer-plugins-libpng/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # $MCom: ports/graphics/gstreamer-plugins-libpng/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= Gstreamer png plugin diff --git a/graphics/gstreamer-plugins-opencv/Makefile b/graphics/gstreamer-plugins-opencv/Makefile index 0b3319b9f217..4caddeb53f23 100644 --- a/graphics/gstreamer-plugins-opencv/Makefile +++ b/graphics/gstreamer-plugins-opencv/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics COMMENT= Gstreamer opencv real time computer vision plugin diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index 5679eeb0124a..1656e306dace 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -7,7 +7,7 @@ PORTNAME= gthumb PORTVERSION= 2.14.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/gtimelapse/Makefile b/graphics/gtimelapse/Makefile index c9226973d762..686a97a8e064 100644 --- a/graphics/gtimelapse/Makefile +++ b/graphics/gtimelapse/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtimelapse DISTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Relase # yes, this is not a typo (here) diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile index b856663bdb44..fbde4eb0673b 100644 --- a/graphics/gtk-update-icon-cache/Makefile +++ b/graphics/gtk-update-icon-cache/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk-update-icon-cache PORTVERSION= 2.24.6 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index 8894f828d17b..5c1a3f90fa18 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtkam PORTVERSION= 0.1.18 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/gphoto/${PORTNAME}/${PORTVERSION} diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile index 641db45ab1d1..95241ebdc1ad 100644 --- a/graphics/gtkdps/Makefile +++ b/graphics/gtkdps/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkdps PORTVERSION= 0.3.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics # ftp://ftp.gyve.org/pub/gtkDPS/ MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile index 2f422c0575cd..46836917baa6 100644 --- a/graphics/gtkgraph/Makefile +++ b/graphics/gtkgraph/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkgraph PORTVERSION= 0.6.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics math MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jedgar diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile index f63d38368310..3fa47a115bb8 100644 --- a/graphics/gwenview-kde4/Makefile +++ b/graphics/gwenview-kde4/Makefile @@ -7,6 +7,7 @@ PORTNAME= gwenview PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 24348ad762a6..f352d2d09cb2 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwenview PORTVERSION= 1.4.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics kde MASTER_SITES= SF @@ -15,6 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An image viewer and browser for the KDE environment LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ + png15:${PORTSDIR}/graphics/png \ exiv2.10:${PORTSDIR}/graphics/exiv2 USE_BZIP2= yes @@ -22,6 +23,7 @@ USE_GMAKE= yes USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool +CFLAGS+=-I${LOCALBASE}/include/libpng15 CONFIGURE_ARGS+=--enable-kipi MAN1= gwenview.1 diff --git a/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp b/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp index a7c10d008337..443d390a083b 100644 --- a/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp +++ b/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp @@ -1,6 +1,14 @@ --- src/gvcore/pngformattype.cpp.orig 2007-09-15 15:46:13.000000000 +0200 -+++ src/gvcore/pngformattype.cpp 2010-03-30 10:12:59.000000000 +0200 -@@ -245,7 +245,7 @@ ++++ src/gvcore/pngformattype.cpp 2012-05-09 12:32:26.000000000 +0200 +@@ -41,6 +41,7 @@ + #include "pngformattype.h" + + #include <png.h> ++#include <pngpriv.h> + + namespace Gwenview { + +@@ -245,7 +246,7 @@ image.setColor( i, qRgba(c,c,c,0xff) ); } if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { @@ -9,7 +17,7 @@ if (g < ncols) { image.setAlphaBuffer(TRUE); image.setColor(g, image.color(g) & RGB_MASK); -@@ -273,7 +273,7 @@ +@@ -273,7 +274,7 @@ info_ptr->palette[i].red, info_ptr->palette[i].green, info_ptr->palette[i].blue, @@ -18,3 +26,21 @@ ) ); i++; +@@ -381,7 +382,7 @@ + return -1; + } + +- if (setjmp((png_ptr)->jmpbuf)) { ++ if (setjmp(png_jmpbuf((png_ptr)))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + return -1; +@@ -409,7 +410,7 @@ + + if ( !png_ptr ) return 0; + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + state = MovieStart; diff --git a/graphics/gx/Makefile b/graphics/gx/Makefile index bf8a18626406..c6c6430a9497 100644 --- a/graphics/gx/Makefile +++ b/graphics/gx/Makefile @@ -7,7 +7,7 @@ PORTNAME= gx PORTVERSION= 0.4.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://perticone.homelinux.net/sergio/c++/gx/src/ CENKES diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile index b3ab7b6f0814..b063c9e4be0f 100644 --- a/graphics/hs-cairo/Makefile +++ b/graphics/hs-cairo/Makefile @@ -7,6 +7,7 @@ PORTNAME= cairo PORTVERSION= 0.12.2 +PORTREVISION= 1 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org diff --git a/graphics/hs-soegtk/Makefile b/graphics/hs-soegtk/Makefile index 5d32bef2f7bb..17736f53d4e5 100644 --- a/graphics/hs-soegtk/Makefile +++ b/graphics/hs-soegtk/Makefile @@ -7,6 +7,7 @@ PORTNAME= soegtk PORTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile index 7c9f5f14ffee..17cfb59597e9 100644 --- a/graphics/hs-svgcairo/Makefile +++ b/graphics/hs-svgcairo/Makefile @@ -7,6 +7,7 @@ PORTNAME= svgcairo PORTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile index 0615a4215650..f18a41b60ed2 100644 --- a/graphics/hsetroot/Makefile +++ b/graphics/hsetroot/Makefile @@ -7,7 +7,7 @@ PORTNAME= hsetroot PORTVERSION= 1.0.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://cdn.thegraveyard.org/releases/hsetroot/ diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 50c570197a38..8a12f37d35b0 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= hugin PORTVERSION= 2011.4.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} @@ -15,7 +16,7 @@ COMMENT= A GUI for Panorama Tools, to stitch panoramic images LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ IlmImf:${PORTSDIR}/graphics/OpenEXR \ exiv2.10:${PORTSDIR}/graphics/exiv2 \ pano13:${PORTSDIR}/graphics/libpano13 \ diff --git a/graphics/icoconvert/Makefile b/graphics/icoconvert/Makefile index 22e060f0f08a..786ad2e6c754 100644 --- a/graphics/icoconvert/Makefile +++ b/graphics/icoconvert/Makefile @@ -7,7 +7,7 @@ PORTNAME= icoconvert PORTVERSION= 2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.mox.net/downloads/ \ http://www.xunix.org/~flz/distfiles/ diff --git a/graphics/icon-slicer/Makefile b/graphics/icon-slicer/Makefile index 188ab8627dec..48bcc3178cd9 100644 --- a/graphics/icon-slicer/Makefile +++ b/graphics/icon-slicer/Makefile @@ -7,7 +7,7 @@ PORTNAME= icon-slicer PORTVERSION= 0.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://www.freedesktop.org/software/icon-slicer/releases/ diff --git a/graphics/icontact/Makefile b/graphics/icontact/Makefile index b2674c82a2f8..40eafd7271cb 100644 --- a/graphics/icontact/Makefile +++ b/graphics/icontact/Makefile @@ -7,7 +7,7 @@ PORTNAME= icontact PORTVERSION= 1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.panix.com/~mbh/icontact/ diff --git a/graphics/icoutils/Makefile b/graphics/icoutils/Makefile index 0e9801c0ead0..ceb358e6542c 100644 --- a/graphics/icoutils/Makefile +++ b/graphics/icoutils/Makefile @@ -7,6 +7,7 @@ PORTNAME= icoutils PORTVERSION= 0.29.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SAVANNAH @@ -16,7 +17,7 @@ COMMENT= Convert/extract images in Microsoft Windows(R) icon/cursor files LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png RUN_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww USE_BZIP2= yes diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile index 9f7629238fcb..3ad546c9b8ee 100644 --- a/graphics/ida/Makefile +++ b/graphics/ida/Makefile @@ -7,6 +7,7 @@ PORTNAME= ida PORTVERSION= 2.09 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.kraxel.org/releases/fbida/ DISTNAME= fbida-${PORTVERSION} @@ -58,7 +59,7 @@ MAKE_ARGS+= HAVE_LIBPCD=no .if defined(WITHOUT_PNG) MAKE_ARGS+= HAVE_LIBPNG=no .else -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .endif .if defined(WITH_SANE) diff --git a/graphics/iiview/Makefile b/graphics/iiview/Makefile index 7c4bb2fd2d14..19b1469b92b0 100644 --- a/graphics/iiview/Makefile +++ b/graphics/iiview/Makefile @@ -7,6 +7,7 @@ PORTNAME= iiview PORTVERSION= 0.28 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/imageindex/Makefile b/graphics/imageindex/Makefile index e5fc402d22bf..0ba9b2192baf 100644 --- a/graphics/imageindex/Makefile +++ b/graphics/imageindex/Makefile @@ -7,7 +7,7 @@ PORTNAME= imageindex PORTVERSION= 1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.edwinh.org/imageindex/release/ \ http://www.reynoldsnet.org/imageindex/release/ diff --git a/graphics/imagesort/Makefile b/graphics/imagesort/Makefile index 2cf9e56b2c78..d0563ce4d633 100644 --- a/graphics/imagesort/Makefile +++ b/graphics/imagesort/Makefile @@ -7,7 +7,7 @@ PORTNAME= imagesort PORTVERSION= 2.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/viewers/X @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A flexible X utility for managing many image files LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ gif.5:${PORTSDIR}/graphics/giflib USE_XORG= x11 xt diff --git a/graphics/imc/Makefile b/graphics/imc/Makefile index 9093a8ffbd3f..f67235e6abaa 100644 --- a/graphics/imc/Makefile +++ b/graphics/imc/Makefile @@ -8,7 +8,7 @@ PORTNAME= imc PORTVERSION= 4.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://users.skynet.be/Peter.Verthez/projects/imc/ diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile index 8a77ba3d89b7..2d88f6d015e5 100644 --- a/graphics/imgseek/Makefile +++ b/graphics/imgseek/Makefile @@ -7,7 +7,7 @@ PORTNAME= imgSeek PORTVERSION= 0.8.6 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/imgtops/Makefile b/graphics/imgtops/Makefile index eb708faabff3..3f70a7731a87 100644 --- a/graphics/imgtops/Makefile +++ b/graphics/imgtops/Makefile @@ -7,7 +7,7 @@ PORTNAME= imgtops PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 45f07869cc5e..45ae9074f4ae 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -8,7 +8,7 @@ PORTNAME= imlib PORTVERSION= 1.9.15 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -16,7 +16,7 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= A graphic library for enlightenment package -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ gif.5:${PORTSDIR}/graphics/giflib @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 MAN1= imlib-config.1 imlib_config.1 diff --git a/graphics/imlib/files/patch-io-png.c b/graphics/imlib/files/patch-io-png.c new file mode 100644 index 000000000000..c4f315a15f4d --- /dev/null +++ b/graphics/imlib/files/patch-io-png.c @@ -0,0 +1,46 @@ +--- gdk_imlib/io-png.c.orig 2002-03-04 18:06:29.000000000 +0100 ++++ gdk_imlib/io-png.c 2012-04-24 23:11:43.000000000 +0200 +@@ -5,6 +5,7 @@ + + #ifdef HAVE_LIBPNG + #include <png.h> ++#include <pngpriv.h> + + unsigned char * + loader_png (FILE * f, int *w, int *h, int *t) +@@ -40,7 +41,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -275,7 +276,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -440,7 +441,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -635,7 +636,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(f); + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); diff --git a/graphics/imlib/files/patch-load.c b/graphics/imlib/files/patch-load.c index a51987eb63ef..471406402710 100644 --- a/graphics/imlib/files/patch-load.c +++ b/graphics/imlib/files/patch-load.c @@ -1,5 +1,22 @@ --- Imlib/load.c.orig 2004-09-21 02:23:20.000000000 +0200 +++ Imlib/load.c 2010-03-28 16:23:13.000000000 +0200 +@@ -170,6 +176,7 @@ + #endif /* HAVE_LIBJPEG */ + + #ifdef HAVE_LIBPNG ++#include <pngpriv.h> + unsigned char * + _LoadPNG(ImlibData * id, FILE * f, int *w, int *h, int *t) + { +@@ -192,7 +198,7 @@ + png_destroy_read_struct(&png_ptr, NULL, NULL); + return NULL; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; @@ -1619,7 +1619,7 @@ return 0; fread(buf, 1, 8, f); diff --git a/graphics/imlib/files/patch-save.c b/graphics/imlib/files/patch-save.c new file mode 100644 index 000000000000..88a23c0426c8 --- /dev/null +++ b/graphics/imlib/files/patch-save.c @@ -0,0 +1,11 @@ +--- Imlib/save.c.orig 2004-09-21 02:22:59.000000000 +0200 ++++ Imlib/save.c 2012-04-27 07:19:57.000000000 +0200 +@@ -342,7 +342,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(f); + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); diff --git a/graphics/imlib/files/patch-utils.c b/graphics/imlib/files/patch-utils.c new file mode 100644 index 000000000000..0d59d7879b1f --- /dev/null +++ b/graphics/imlib/files/patch-utils.c @@ -0,0 +1,19 @@ +--- Imlib/utils.c.orig 2012-04-27 07:12:19.000000000 +0200 ++++ Imlib/utils.c 2012-04-27 07:15:39.000000000 +0200 +@@ -1899,6 +1899,7 @@ + }; + + #ifdef HAVE_LIBPNG ++#include "pngpriv.h" + static void + _png_io_read(png_structp png_ptr, + png_bytep data, png_uint_32 size) +@@ -1982,7 +1983,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index da5667847e20..ac3b09d3cf3f 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -7,7 +7,7 @@ PORTNAME= imlib2 PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= graphics enlightenment MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -65,7 +65,7 @@ PLIST_SUB+= JPEG="@comment " .endif .if !defined(WITHOUT_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png PLIST_SUB+= PNG="" .else CONFIGURE_ARGS+= --without-png diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile index ddb2dc99ef24..3ca86d7a8571 100644 --- a/graphics/imlib2_loaders/Makefile +++ b/graphics/imlib2_loaders/Makefile @@ -7,6 +7,7 @@ PORTNAME= imlib2_loaders PORTVERSION= 1.4.5 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= graphics enlightenment MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 115a8845ea13..0c604b28d3a6 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -7,7 +7,7 @@ PORTNAME= inkscape PORTVERSION= 0.48.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= SF MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION} @@ -23,6 +23,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ gtkspell.0:${PORTSDIR}/textproc/gtkspell \ lcms.1:${PORTSDIR}/graphics/lcms \ wpg-0.2:${PORTSDIR}/graphics/libwpg \ + png15:${PORTSDIR}/graphics/png \ Magick++.5:${PORTSDIR}/graphics/ImageMagick RUN_DEPENDS= ${SITE_PERL}/XML/XQL.pm:${PORTSDIR}/textproc/p5-XML-XQL @@ -63,7 +64,7 @@ CONFIGURE_ARGS+= --enable-poppler-cairo=no post-patch: @${REINPLACE_CMD} -e 's|ieefp.h|ieeefp.h|' \ ${WRKSRC}/src/2geom/bezier-utils.cpp - @${REINPLACE_CMD} -e 's|libpng >= 1.2|libpng14 >= 1.2|g' \ + @${REINPLACE_CMD} -e 's|libpng >= 1.2|libpng15 >= 1.2|g' \ -e 's|-ldl||g' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "*.h" -o -name "*.cpp" | ${XARGS} \ diff --git a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp new file mode 100644 index 000000000000..e9e49d9930b6 --- /dev/null +++ b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp @@ -0,0 +1,11 @@ +--- src/extension/internal/pdfinput/svg-builder.cpp.orig 2012-05-04 10:06:12.000000000 +0200 ++++ src/extension/internal/pdfinput/svg-builder.cpp 2012-05-04 12:24:12.000000000 +0200 +@@ -1443,7 +1443,7 @@ + return NULL; + } + // Set error handler +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return NULL; + } diff --git a/graphics/inkscape/files/patch-src_helper_png-write.cpp b/graphics/inkscape/files/patch-src_helper_png-write.cpp new file mode 100644 index 000000000000..078b4252c930 --- /dev/null +++ b/graphics/inkscape/files/patch-src_helper_png-write.cpp @@ -0,0 +1,11 @@ +--- src/helper/png-write.cpp.orig 2012-05-04 10:06:13.000000000 +0200 ++++ src/helper/png-write.cpp 2012-05-04 12:02:19.000000000 +0200 +@@ -165,7 +165,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose(fp); + png_destroy_write_struct(&png_ptr, &info_ptr); diff --git a/graphics/inkscape/files/patch-src_sp-image.cpp b/graphics/inkscape/files/patch-src_sp-image.cpp new file mode 100644 index 000000000000..6b1fed560818 --- /dev/null +++ b/graphics/inkscape/files/patch-src_sp-image.cpp @@ -0,0 +1,11 @@ +--- src/sp-image.cpp.orig 2011-07-08 20:25:09.468790000 +0200 ++++ src/sp-image.cpp 2012-05-05 08:06:14.000000000 +0200 +@@ -388,7 +388,7 @@ + { + char* name = 0; + int compression_type = 0; +- char* profile = 0; ++ png_byte * profile = 0; + png_uint_32 proflen = 0; + if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { + // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile index 5dcfe6bb4a16..1b2712c1e544 100644 --- a/graphics/ipe/Makefile +++ b/graphics/ipe/Makefile @@ -7,6 +7,7 @@ PORTNAME= ipe DISTVERSION= 7.1.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}7/${PORTNAME}/7.1.0 diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile index 6f13115381a2..b830d8a3cd3e 100644 --- a/graphics/iulib/Makefile +++ b/graphics/iulib/Makefile @@ -7,7 +7,7 @@ PORTNAME= iulib PORTVERSION= 0.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE EXTRACT_SUFX= .tgz @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= hiroto.kagotani@gmail.com COMMENT= A library of image understanding-related algorithms -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/graphics/jbig2dec/Makefile b/graphics/jbig2dec/Makefile index e21364edbebc..6a7ca7b62dea 100644 --- a/graphics/jbig2dec/Makefile +++ b/graphics/jbig2dec/Makefile @@ -7,6 +7,7 @@ PORTNAME= jbig2dec PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= SF \ http://ghostscript.com/~giles/jbig2/jbig2dec/ @@ -36,8 +37,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+=--with-libpng=${LOCALBASE} +CFLAGS+= -I${LOCALBASE}/include/libpng15 .endif .if ${PORT_OPTIONS:MTESTS} diff --git a/graphics/jbig2dec/files/patch-jbig2_image_png.c b/graphics/jbig2dec/files/patch-jbig2_image_png.c new file mode 100644 index 000000000000..1aa509b0f27a --- /dev/null +++ b/graphics/jbig2dec/files/patch-jbig2_image_png.c @@ -0,0 +1,10 @@ +--- jbig2_image_png.c.orig 2009-07-16 06:44:49.000000000 +0200 ++++ jbig2_image_png.c 2012-04-24 21:54:55.000000000 +0200 +@@ -21,6 +21,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <png.h> ++#include <pngpriv.h> + + #include "jbig2.h" + #include "jbig2_priv.h" diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile index 9cfb85eab833..02e121885a9d 100644 --- a/graphics/k3d/Makefile +++ b/graphics/k3d/Makefile @@ -9,7 +9,7 @@ PORTNAME= k3d PORTVERSION= 0.6.7.0 DISTVERSIONSUFFIX=-src -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/K-3D%20Source/K-3D%20${PORTVERSION} diff --git a/graphics/kalbum/Makefile b/graphics/kalbum/Makefile index 7b2085d6bad4..46f42f64f5d3 100644 --- a/graphics/kalbum/Makefile +++ b/graphics/kalbum/Makefile @@ -6,7 +6,7 @@ PORTNAME= kalbum PORTVERSION= 0.8.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics kde MASTER_SITES= http://www.paldandy.com/kalbum/data/${PORTNAME}-${PORTVERSION}/ diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile index 04a2d32f8165..d708569b26bc 100644 --- a/graphics/kamera-kde4/Makefile +++ b/graphics/kamera-kde4/Makefile @@ -7,6 +7,7 @@ PORTNAME= kamera PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/kamera/Makefile b/graphics/kamera/Makefile index 8fd8edc27538..ce627d262ebd 100644 --- a/graphics/kamera/Makefile +++ b/graphics/kamera/Makefile @@ -7,7 +7,7 @@ PORTNAME= kamera PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile index 9878c92873f6..3678da70657b 100644 --- a/graphics/kbarcode/Makefile +++ b/graphics/kbarcode/Makefile @@ -7,7 +7,7 @@ PORTNAME= kbarcode PORTVERSION= 2.0.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics kde MASTER_SITES= SF/${PORTNAME}/Stable/${PORTVERSION} diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile index fe9b3d4cce3a..3cbd59cda553 100644 --- a/graphics/kcolorchooser/Makefile +++ b/graphics/kcolorchooser/Makefile @@ -7,6 +7,7 @@ PORTNAME= kcolorchooser PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/kcoloredit/Makefile b/graphics/kcoloredit/Makefile index f52292f22221..5a866d78bdd4 100644 --- a/graphics/kcoloredit/Makefile +++ b/graphics/kcoloredit/Makefile @@ -7,7 +7,7 @@ PORTNAME= kcoloredit PORTVERSION= ${APP_VER}.${EXTRA_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/extragear diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index fc1e17287907..606cd98ae963 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdegraphics PORTVERSION= ${KDE_VERSION} -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/graphics/kdegraphics4-mobipocket/Makefile b/graphics/kdegraphics4-mobipocket/Makefile index c93ad8f9f42b..c7ff0a56ca52 100644 --- a/graphics/kdegraphics4-mobipocket/Makefile +++ b/graphics/kdegraphics4-mobipocket/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdegraphics-mobipocket PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/kdegraphics4-strigi-analyzer/Makefile b/graphics/kdegraphics4-strigi-analyzer/Makefile index ef76a290a791..f4d3e2456216 100644 --- a/graphics/kdegraphics4-strigi-analyzer/Makefile +++ b/graphics/kdegraphics4-strigi-analyzer/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdegraphics-strigi-analyzer PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/kdegraphics4-svgpart/Makefile b/graphics/kdegraphics4-svgpart/Makefile index 19dbcc04df25..cfa246a2174c 100644 --- a/graphics/kdegraphics4-svgpart/Makefile +++ b/graphics/kdegraphics4-svgpart/Makefile @@ -7,6 +7,7 @@ PORTNAME= svgpart PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/kdegraphics4-thumbnailers/Makefile b/graphics/kdegraphics4-thumbnailers/Makefile index 2bdcb7b63991..bc61bd233d1a 100644 --- a/graphics/kdegraphics4-thumbnailers/Makefile +++ b/graphics/kdegraphics4-thumbnailers/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdegraphics-thumbnailers PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/kgraphviewer/Makefile b/graphics/kgraphviewer/Makefile index 7003f791cfc0..c289c68dab5d 100644 --- a/graphics/kgraphviewer/Makefile +++ b/graphics/kgraphviewer/Makefile @@ -7,7 +7,7 @@ PORTNAME= kgraphviewer PORTVERSION= ${APP_VER}.${EXTRA_VER} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/extragear diff --git a/graphics/kiconedit/Makefile b/graphics/kiconedit/Makefile index 930f19c9a98e..d4e4f92b69a5 100644 --- a/graphics/kiconedit/Makefile +++ b/graphics/kiconedit/Makefile @@ -7,7 +7,7 @@ PORTNAME= kiconedit PORTVERSION= ${EXTRA_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/extragear diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile index b12bf50a5235..8b17166c9279 100644 --- a/graphics/kipi-plugins-kde4/Makefile +++ b/graphics/kipi-plugins-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= kipi-plugins PORTVERSION= 1.9.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= graphics kde MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION} diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile index c91539210e7b..8d2d4a66ad55 100644 --- a/graphics/kipi-plugins/Makefile +++ b/graphics/kipi-plugins/Makefile @@ -7,7 +7,7 @@ PORTNAME= kipi-plugins PORTVERSION= 0.1.7 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= graphics kde MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION} @@ -17,6 +17,7 @@ COMMENT= KDE Image Plugin Interface plugins LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ kexiv2.5:${PORTSDIR}/graphics/libkexiv2 \ + png15:${PORTSDIR}/graphics/png \ kdcraw.4:${PORTSDIR}/graphics/libkdcraw OPTIONS= ACQUIREIMAGES "scanner/screenshot plugin" on \ diff --git a/graphics/kipi-plugins/files/patch-rawdecodingiface.cpp b/graphics/kipi-plugins/files/patch-rawdecodingiface.cpp new file mode 100644 index 000000000000..537790ab0934 --- /dev/null +++ b/graphics/kipi-plugins/files/patch-rawdecodingiface.cpp @@ -0,0 +1,11 @@ +--- kipi-plugins/rawconverter/rawdecodingiface.cpp.orig 2008-12-13 12:20:05.000000000 +0100 ++++ kipi-plugins/rawconverter/rawdecodingiface.cpp 2012-05-09 12:36:43.000000000 +0200 +@@ -299,7 +299,7 @@ + if (!ICCColorProfile.isEmpty()) + { + png_set_iCCP(png_ptr, info_ptr, "icc", PNG_COMPRESSION_TYPE_BASE, +- ICCColorProfile.data(), ICCColorProfile.size()); ++ (const png_byte *)ICCColorProfile.data(), ICCColorProfile.size()); + } + + QString libpngver(PNG_HEADER_VERSION_STRING); diff --git a/graphics/kisomandel/Makefile b/graphics/kisomandel/Makefile index cb747e847798..2385355ebc5e 100644 --- a/graphics/kisomandel/Makefile +++ b/graphics/kisomandel/Makefile @@ -8,14 +8,14 @@ PORTNAME= kisomandel PORTVERSION= 0.66 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A fractal rendering program with nice 3d-display in realtime -LIB_DEPENDS= png:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png PLIST_FILES= bin/kisomandel USE_BZIP2= yes diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile index efb371c2d225..9bdc9e8e9fee 100644 --- a/graphics/klatexformula/Makefile +++ b/graphics/klatexformula/Makefile @@ -7,7 +7,7 @@ PORTNAME= klatexformula PORTVERSION= 3.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile index 4e7037100995..905953325087 100644 --- a/graphics/kludge3d/Makefile +++ b/graphics/kludge3d/Makefile @@ -8,7 +8,7 @@ PORTNAME= kludge3d PORTVERSION= 20040822 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/source/2004-08-22 diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile index 71b73c65ece7..ab347e50bd56 100644 --- a/graphics/kolourpaint/Makefile +++ b/graphics/kolourpaint/Makefile @@ -7,6 +7,7 @@ PORTNAME= kolourpaint PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/kooka/Makefile b/graphics/kooka/Makefile index 9a27f519e695..7e0d5beb2e1a 100644 --- a/graphics/kooka/Makefile +++ b/graphics/kooka/Makefile @@ -7,7 +7,7 @@ PORTNAME= kooka PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile index fa510172b8a5..08f22e9522b5 100644 --- a/graphics/kphotoalbum-kde4/Makefile +++ b/graphics/kphotoalbum-kde4/Makefile @@ -6,7 +6,7 @@ PORTNAME= kphotoalbum PORTVERSION= ${APP_VER}.${EXTRA_VER} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/extragear diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index 88da76124064..072b0b0061cd 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -6,7 +6,7 @@ PORTNAME= kphotoalbum PORTVERSION= 3.1.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics kde MASTER_SITES= http://www.kphotoalbum.org/data/download/ diff --git a/graphics/kpovmodeler/Makefile b/graphics/kpovmodeler/Makefile index a9bdd232eabf..d63ffb2209a7 100644 --- a/graphics/kpovmodeler/Makefile +++ b/graphics/kpovmodeler/Makefile @@ -7,7 +7,7 @@ PORTNAME= kpovmodeler PORTVERSION= ${APP_VER}.${EXTRA_VER} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${EXTRA_VER}/src/extragear diff --git a/graphics/kradview/Makefile b/graphics/kradview/Makefile index 2d1d8f2e0f23..aead5849646c 100644 --- a/graphics/kradview/Makefile +++ b/graphics/kradview/Makefile @@ -7,7 +7,7 @@ PORTNAME= kradview PORTVERSION= 1.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics kde MASTER_SITES= http://www.orcero.org/irbis/kradview/ EXTRACT_SUFX= .tgz diff --git a/graphics/ksaneplugin/Makefile b/graphics/ksaneplugin/Makefile index 81e67bb8060a..38b4ccfc17a5 100644 --- a/graphics/ksaneplugin/Makefile +++ b/graphics/ksaneplugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= ksaneplugin PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/ksnapshot/Makefile b/graphics/ksnapshot/Makefile index be9bc7c29367..538db09a5b86 100644 --- a/graphics/ksnapshot/Makefile +++ b/graphics/ksnapshot/Makefile @@ -7,6 +7,7 @@ PORTNAME= ksnapshot PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile index 6529755cf096..748a5c59a216 100644 --- a/graphics/kudu/Makefile +++ b/graphics/kudu/Makefile @@ -7,7 +7,7 @@ PORTNAME= kudu PORTVERSION= 0.1.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile index f3a932e90434..b82555954b18 100644 --- a/graphics/kuickshow-kde4/Makefile +++ b/graphics/kuickshow-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= kuickshow PORTVERSION= ${APP_VER}.${EXTRA_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/extragear diff --git a/graphics/kuickshow/Makefile b/graphics/kuickshow/Makefile index 3e61a5f3bb24..bf4b897a7e5e 100644 --- a/graphics/kuickshow/Makefile +++ b/graphics/kuickshow/Makefile @@ -7,7 +7,7 @@ PORTNAME= kuickshow PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/graphics/landscape/Makefile b/graphics/landscape/Makefile index 51992a5aef6e..6018c832dc57 100644 --- a/graphics/landscape/Makefile +++ b/graphics/landscape/Makefile @@ -7,7 +7,7 @@ PORTNAME= landscape PORTVERSION= 0.7 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics kde MASTER_SITES= http://homepage.ntlworld.com/jon.belson/files/ diff --git a/graphics/lcdtest/Makefile b/graphics/lcdtest/Makefile index 6bb755677214..a8c75f4844f0 100644 --- a/graphics/lcdtest/Makefile +++ b/graphics/lcdtest/Makefile @@ -7,7 +7,7 @@ PORTNAME= lcdtest PORTVERSION= 1.18 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.brouhaha.com/~eric/software/lcdtest/download/ \ http://www.predatorlabs.net/dl/ diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile index 989eabe4133e..a02446d79827 100644 --- a/graphics/lensfun/Makefile +++ b/graphics/lensfun/Makefile @@ -7,7 +7,7 @@ PORTNAME= lensfun PORTVERSION= 0.2.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= BERLIOS @@ -16,7 +16,7 @@ COMMENT= Library for fixing lens geometry distortions LICENSE= LGPL3 -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_GMAKE= yes diff --git a/graphics/lensfun/files/patch-image.cpp b/graphics/lensfun/files/patch-image.cpp new file mode 100644 index 000000000000..a5b111788379 --- /dev/null +++ b/graphics/lensfun/files/patch-image.cpp @@ -0,0 +1,37 @@ +--- libs/auxfun/image.cpp.orig 2008-05-02 08:56:04.000000000 +0200 ++++ libs/auxfun/image.cpp 2012-05-04 12:31:16.000000000 +0200 +@@ -6,6 +6,7 @@ + #include "image.h" + #include <zlib.h> + #include <png.h> ++#include <pngpriv.h> + #include <stdlib.h> + #include <unistd.h> + #include <math.h> +@@ -94,7 +95,7 @@ + + png_init_io (png, file); + +- if (setjmp (png->jmpbuf)) ++ if (setjmp (png_jmpbuf(png))) + // If we get here, we had a problem reading the file + goto nomem; + +@@ -157,7 +158,7 @@ + row_pointers = new png_bytep [Height]; + + if (!row_pointers +- || setjmp (png->jmpbuf)) // Set a new exception handler ++ || setjmp (png_jmpbuf(png))) // Set a new exception handler + { + delete [] row_pointers; + nomem: +@@ -214,7 +215,7 @@ + } + + /* Catch processing errors */ +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + /* If we get here, we had a problem writing the file */ + goto error2; + diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile index 5362f3b7c71a..3c479b51dcae 100644 --- a/graphics/leptonica/Makefile +++ b/graphics/leptonica/Makefile @@ -7,6 +7,7 @@ PORTNAME= leptonica PORTVERSION= 1.68 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE @@ -15,7 +16,7 @@ COMMENT= C library for efficient image processing and image analysis operations LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ webp.2:${PORTSDIR}/graphics/webp diff --git a/graphics/leptonica/files/patch-pngio.c b/graphics/leptonica/files/patch-pngio.c new file mode 100644 index 000000000000..70c02ed57047 --- /dev/null +++ b/graphics/leptonica/files/patch-pngio.c @@ -0,0 +1,10 @@ +--- src/pngio.c.orig 2011-02-01 06:41:12.000000000 +0100 ++++ src/pngio.c 2012-05-04 12:33:51.000000000 +0200 +@@ -107,6 +107,7 @@ + /* --------------------------------------------*/ + + #include "png.h" ++#include "zlib.h" + + /* ----------------Set defaults for read/write options ----------------- */ + /* strip 16 bpp --> 8 bpp on reading png; default is for stripping */ diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile index a13f188ae5c8..77e51cb09ab3 100644 --- a/graphics/libafterimage/Makefile +++ b/graphics/libafterimage/Makefile @@ -8,6 +8,7 @@ PORTNAME= libafterimage PORTVERSION= 1.20 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/afterstep/libAfterImage/${PORTVERSION} DISTNAME= libAfterImage-${PORTVERSION} @@ -17,7 +18,7 @@ COMMENT= Generic imaging library originally designed for AfterStep LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ gif.5:${PORTSDIR}/graphics/giflib \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ freetype.9:${PORTSDIR}/print/freetype2 diff --git a/graphics/libafterimage/files/patch-export.c b/graphics/libafterimage/files/patch-export.c new file mode 100644 index 000000000000..950da3b1b275 --- /dev/null +++ b/graphics/libafterimage/files/patch-export.c @@ -0,0 +1,11 @@ +--- export.c.orig 2011-01-15 06:52:22.000000000 +0100 ++++ export.c 2012-05-04 12:57:15.000000000 +0200 +@@ -496,7 +496,7 @@ + png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); + if ( png_ptr != NULL ) + if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) +- if( setjmp(png_ptr->jmpbuf) ) ++ if( setjmp(png_jmpbuf(png_ptr)) ) + { + png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr); + info_ptr = NULL ; diff --git a/graphics/libafterimage/files/patch-import.c b/graphics/libafterimage/files/patch-import.c new file mode 100644 index 000000000000..3b2a5f7f8b47 --- /dev/null +++ b/graphics/libafterimage/files/patch-import.c @@ -0,0 +1,19 @@ +--- import.c.orig 2011-01-15 06:52:22.000000000 +0100 ++++ import.c 2012-05-04 18:57:46.000000000 +0200 +@@ -40,6 +40,7 @@ + # else + # include <png.h> + # endif ++# include <pngpriv.h> + #else + # include <setjmp.h> + # ifdef HAVE_JPEG +@@ -1251,7 +1252,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if ( !setjmp (png_ptr->jmpbuf)) ++ if ( !setjmp (png_jmpbuf(png_ptr))) + { + ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ; + diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile index c27c9abde7d5..d26f20ce9fbd 100644 --- a/graphics/libboard/Makefile +++ b/graphics/libboard/Makefile @@ -7,6 +7,7 @@ PORTNAME= libboard DISTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile index a652200502b4..3a48ca3d099e 100644 --- a/graphics/libcaca/Makefile +++ b/graphics/libcaca/Makefile @@ -7,6 +7,7 @@ PORTNAME= libcaca DISTVERSION= 0.99.beta18 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://caca.zoy.org/raw-attachment/wiki/libcaca/ diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile index 759677ebba2a..b6c6cfe97a09 100644 --- a/graphics/libchamplain/Makefile +++ b/graphics/libchamplain/Makefile @@ -8,7 +8,7 @@ PORTNAME= libchamplain PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= GNOME diff --git a/graphics/libdmtx/Makefile b/graphics/libdmtx/Makefile index ddad2eb9acdc..c97ae7014100 100644 --- a/graphics/libdmtx/Makefile +++ b/graphics/libdmtx/Makefile @@ -7,7 +7,7 @@ PORTNAME= libdmtx PORTVERSION= 0.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile index 1e94691fc441..bf39f25e96ae 100644 --- a/graphics/libexif-gtk/Makefile +++ b/graphics/libexif-gtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= libexif-gtk PORTVERSION= 0.3.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= SF/libexif/${PORTNAME}/${PORTVERSION} diff --git a/graphics/libgfx/Makefile b/graphics/libgfx/Makefile index 4b6cf1b7c854..8df8ed5d1218 100644 --- a/graphics/libgfx/Makefile +++ b/graphics/libgfx/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgfx DISTVERSION= 1.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://mgarland.org/files/dist/ @@ -18,7 +18,7 @@ LICENSE= MIT LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ gzstream.0:${PORTSDIR}/devel/gzstream \ jpeg.11:${PORTSDIR}/graphics/jpeg @@ -26,6 +26,7 @@ BUILD_WRKSRC= ${WRKSRC}/src USE_GL= glu USE_GMAKE= yes +USE_XORG= x11 xext xft xinerama GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gzstream --with-libtiff-lzw --with-x ALL_TARGET= ${PORTNAME}.so diff --git a/graphics/libgfx/files/patch-png.cxx b/graphics/libgfx/files/patch-png.cxx new file mode 100644 index 000000000000..80b3f88d92c0 --- /dev/null +++ b/graphics/libgfx/files/patch-png.cxx @@ -0,0 +1,20 @@ +--- src/raster-png.cxx.orig 2004-09-27 06:45:31.000000000 +0200 ++++ src/raster-png.cxx 2012-05-04 12:59:52.000000000 +0200 +@@ -42,7 +42,7 @@ + // Because we didn't set up any error handlers, we need to be + // prepared to handle longjmps out of the library on error + // conditions. +- if( setjmp(png_ptr->jmpbuf) ) ++ if( setjmp(png_jmpbuf(png_ptr)) ) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(fp); +@@ -132,7 +132,7 @@ + return false; + } + +- if( setjmp(png_ptr->jmpbuf) ) ++ if( setjmp(png_jmpbuf(png_ptr)) ) + { + fclose(fp); + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 35658ef9d531..14ad2b7544fd 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgnomecanvas PORTVERSION= 2.30.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile index 7b1defbcb373..ca69343793f7 100644 --- a/graphics/libgnomecanvasmm/Makefile +++ b/graphics/libgnomecanvasmm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgnomecanvasmm PORTVERSION= 2.0.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics gnome MASTER_SITES= SF/gtkmm/OldFiles DIST_SUBDIR= gnome2 diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile index a9cd647a98ce..cf01f1720974 100644 --- a/graphics/libgnomecanvasmm26/Makefile +++ b/graphics/libgnomecanvasmm26/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgnomecanvasmm PORTVERSION= 2.26.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index 448258946339..ca0a07dc85fe 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -7,7 +7,7 @@ PORTNAME= libimg PORTVERSION= 1.2.4 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES?= graphics tk MASTER_SITES= SF/tkimg/tkimg/${PORTVERSION:R} DISTNAME= img${PORTVERSION} @@ -15,7 +15,7 @@ DISTNAME= img${PORTVERSION} MAINTAINER= mi@aldan.algebra.com COMMENT= A library of image format handlers for Tk4.1 and later -LIB_DEPENDS= png:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ tiff:${PORTSDIR}/graphics/tiff diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile index 09ee263f6a93..c12b7c9a05b0 100644 --- a/graphics/libkdcraw-kde4/Makefile +++ b/graphics/libkdcraw-kde4/Makefile @@ -6,6 +6,7 @@ PORTNAME= libkdcraw PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile index 49a5de7e75e6..c6a76464ceac 100644 --- a/graphics/libkdcraw/Makefile +++ b/graphics/libkdcraw/Makefile @@ -6,7 +6,7 @@ PORTNAME= libkdcraw PORTVERSION= 0.1.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics devel MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION} diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile index 16fe829bd2ee..b2eac83d62d4 100644 --- a/graphics/libkexif/Makefile +++ b/graphics/libkexif/Makefile @@ -6,7 +6,7 @@ PORTNAME= libkexif PORTVERSION= 0.2.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics devel MASTER_SITES= SF/kipi/OldFiles diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile index a53938a88458..fc53688247bd 100644 --- a/graphics/libkexiv2-kde4/Makefile +++ b/graphics/libkexiv2-kde4/Makefile @@ -7,6 +7,7 @@ PORTNAME= libkexiv2 PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile index ef9dbfd18bb6..59fbf349ffc1 100644 --- a/graphics/libkexiv2/Makefile +++ b/graphics/libkexiv2/Makefile @@ -6,7 +6,7 @@ PORTNAME= libkexiv2 PORTVERSION= 0.1.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics devel MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION} diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile index d8ec49021306..f1f05f4246d6 100644 --- a/graphics/libkipi-kde4/Makefile +++ b/graphics/libkipi-kde4/Makefile @@ -6,6 +6,7 @@ PORTNAME= libkipi PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile index 88eb27e517b1..a14ecd2def1a 100644 --- a/graphics/libkipi/Makefile +++ b/graphics/libkipi/Makefile @@ -6,7 +6,7 @@ PORTNAME= libkipi PORTVERSION= 0.1.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics kde devel MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION} diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile index 08c967340a17..160b396f3f56 100644 --- a/graphics/libksane/Makefile +++ b/graphics/libksane/Makefile @@ -6,6 +6,7 @@ PORTNAME= libksane PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile index baaf76a3603b..45544309a9db 100644 --- a/graphics/libopenraw/Makefile +++ b/graphics/libopenraw/Makefile @@ -7,7 +7,7 @@ PORTNAME= libopenraw PORTVERSION= 0.0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://libopenraw.freedesktop.org/download/ diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile index b1dc587c3678..2d5b8cb8b79d 100644 --- a/graphics/libpano12/Makefile +++ b/graphics/libpano12/Makefile @@ -10,7 +10,7 @@ PORTNAME= libpano12 PORTVERSION= 2.8.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics java MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -18,7 +18,7 @@ MAINTAINER= vd@FreeBSD.org COMMENT= Panorama Tools to make panorama pictures LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg USE_GNOME= gtk20 glib20 pango atk @@ -28,6 +28,7 @@ USE_AUTOTOOLS= autoconf:env autoheader:env aclocal:env \ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \ -I${LOCALBASE}/include/glib-2.0 \ + -I${LOCALBASE}/include/libpng15 \ -I${LOCALBASE}/include/pango-1.0 \ -I${LOCALBASE}/include/atk-1.0 CONFIGURE_ARGS= --with-png=${LOCALBASE} \ diff --git a/graphics/libpano12/files/patch-png.c b/graphics/libpano12/files/patch-png.c new file mode 100644 index 000000000000..0bd2e46b40d9 --- /dev/null +++ b/graphics/libpano12/files/patch-png.c @@ -0,0 +1,27 @@ +--- png.c.orig 2006-08-20 23:04:06.000000000 +0200 ++++ png.c 2012-05-04 13:03:57.000000000 +0200 +@@ -1,5 +1,6 @@ + #include "filter.h" + #include "png.h" ++#include "pngpriv.h" + + + +@@ -56,7 +57,7 @@ + } + + /* set error handling */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem reading the file */ + fclose(outfile); +@@ -165,7 +166,7 @@ + } + + /* set error handling if you are using the setjmp/longjmp method */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile index 85c9f5410c9f..4314da5b5177 100644 --- a/graphics/libpano13/Makefile +++ b/graphics/libpano13/Makefile @@ -7,6 +7,7 @@ PORTNAME= libpano13 PORTVERSION= 2.9.18 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -14,7 +15,7 @@ MAINTAINER= vd@FreeBSD.org COMMENT= Cross-platform library behind Panorama Tools and other photo stitchers LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff USE_GNOME= gtk20 glib20 pango atk diff --git a/graphics/libpuzzle/Makefile b/graphics/libpuzzle/Makefile index 9cf63b72f997..620b58d1349c 100644 --- a/graphics/libpuzzle/Makefile +++ b/graphics/libpuzzle/Makefile @@ -7,7 +7,7 @@ PORTNAME= libpuzzle PORTVERSION= 0.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/ diff --git a/graphics/libqglviewer/Makefile b/graphics/libqglviewer/Makefile index c4efdc27880f..e27f9a5ffe77 100644 --- a/graphics/libqglviewer/Makefile +++ b/graphics/libqglviewer/Makefile @@ -8,7 +8,7 @@ PORTNAME= libqglviewer PORTVERSION= 2.2.4.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/src/ DISTNAME= libQGLViewer-${PORTVERSION:R}-${PORTVERSION:E} diff --git a/graphics/libqrencode/Makefile b/graphics/libqrencode/Makefile index 1426141eed7b..ab94a995cc71 100644 --- a/graphics/libqrencode/Makefile +++ b/graphics/libqrencode/Makefile @@ -8,7 +8,7 @@ PORTNAME= libqrencode PORTVERSION= 3.3.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://fukuchi.org/works/qrencode/ DISTNAME= qrencode-${PORTVERSION} @@ -16,7 +16,7 @@ DISTNAME= qrencode-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org COMMENT= A C library for encoding data in a QR Code symbol -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_GNOME= gnomehack pkgconfig GNU_CONFIGURE= yes diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index a39befe62f5e..d9819d6b688b 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -8,6 +8,7 @@ PORTNAME= librsvg2 PORTVERSION= 2.34.1 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/librsvg/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/graphics/libsvg-cairo/Makefile b/graphics/libsvg-cairo/Makefile index 6af35dbf2c23..e2b4858b00df 100644 --- a/graphics/libsvg-cairo/Makefile +++ b/graphics/libsvg-cairo/Makefile @@ -8,7 +8,7 @@ PORTNAME= libsvg-cairo PORTVERSION= 0.1.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ diff --git a/graphics/libsvg/Makefile b/graphics/libsvg/Makefile index 2db8602620a4..3f3b16d350e8 100644 --- a/graphics/libsvg/Makefile +++ b/graphics/libsvg/Makefile @@ -8,7 +8,7 @@ PORTNAME= libsvg PORTVERSION= 0.1.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ @@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A parser for SVG content in files or buffers LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg USE_AUTOTOOLS= libtool diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index a73b65827d97..c5e2d2bcecbd 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -7,7 +7,7 @@ PORTNAME= libwmf PORTVERSION= 0.2.8.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/wvware/${PORTNAME}/${PORTVERSION} @@ -16,7 +16,7 @@ COMMENT= Tools and library for converting Microsoft WMF (windows metafile) BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 USE_AUTOTOOLS= libtool diff --git a/graphics/libwpg/Makefile b/graphics/libwpg/Makefile index 9cedf888696a..ccb3eda0d268 100644 --- a/graphics/libwpg/Makefile +++ b/graphics/libwpg/Makefile @@ -7,6 +7,7 @@ PORTNAME= libwpg PORTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/libwpg01/Makefile b/graphics/libwpg01/Makefile index 667523eca4c4..b3e0bb491f5e 100644 --- a/graphics/libwpg01/Makefile +++ b/graphics/libwpg01/Makefile @@ -7,7 +7,7 @@ PORTNAME= libwpg PORTVERSION= 0.1.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/libx3dtk/Makefile b/graphics/libx3dtk/Makefile index a7c40f0e5adc..260183b6a51a 100644 --- a/graphics/libx3dtk/Makefile +++ b/graphics/libx3dtk/Makefile @@ -8,7 +8,7 @@ PORTNAME= libx3dtk PORTVERSION= 1.0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://artis.imag.fr/Members/Yannick.Legoc/X3D/libs/ DISTNAME= X3DToolKit-${PORTVERSION:R}.${PORTVERSION:E} diff --git a/graphics/linux-cairo/Makefile b/graphics/linux-cairo/Makefile index b697f5d6cd2b..d988a2e6d9c2 100644 --- a/graphics/linux-cairo/Makefile +++ b/graphics/linux-cairo/Makefile @@ -8,7 +8,7 @@ PORTNAME= cairo PORTVERSION= 1.0.2 DISTVERSIONSUFFIX= -2.gst.1.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics linux MASTER_SITES= http://gstreamer.freedesktop.org/pkg/%SUBDIR%/ CENKES/myports MASTER_SITE_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/RPMS.deps diff --git a/graphics/linux-f10-cairo/Makefile b/graphics/linux-f10-cairo/Makefile index d43f48f15b14..5843ba5da33c 100644 --- a/graphics/linux-f10-cairo/Makefile +++ b/graphics/linux-f10-cairo/Makefile @@ -7,7 +7,7 @@ PORTNAME= cairo PORTVERSION= 1.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} PKGNAMEPREFIX= linux-f10- diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile index b87269fb2bd2..50b436204ac6 100644 --- a/graphics/linux-f10-png/Makefile +++ b/graphics/linux-f10-png/Makefile @@ -7,7 +7,7 @@ PORTNAME= png PORTVERSION= 1.2.37 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} PKGNAMEPREFIX= linux-f10- diff --git a/graphics/linux-f10-sdl_image/Makefile b/graphics/linux-f10-sdl_image/Makefile index e802d4bd5bcb..95b4c6133b62 100644 --- a/graphics/linux-f10-sdl_image/Makefile +++ b/graphics/linux-f10-sdl_image/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdl_image PORTVERSION= 1.2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics linux MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} PKGNAMEPREFIX= linux-f10- diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile index b4c770a3731c..98255877e7d9 100644 --- a/graphics/linux-png/Makefile +++ b/graphics/linux-png/Makefile @@ -7,7 +7,7 @@ PORTNAME= png PORTVERSION= 1.2.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics linux MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} DISTNAME= libpng-${PORTVERSION}-2 diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile index 1ec4ad49b8be..2a99a209bcce 100644 --- a/graphics/linux-png10/Makefile +++ b/graphics/linux-png10/Makefile @@ -7,7 +7,7 @@ PORTNAME= png PORTVERSION= 1.0.18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics linux MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} DISTNAME= libpng10-${PORTVERSION}-2 diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile index a6eeb0c422dd..a0a103c5c2d7 100644 --- a/graphics/lprof-devel/Makefile +++ b/graphics/lprof-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= lprof PORTVERSION= 20080514 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \ ${MASTER_SITE_LOCAL:S|%SUBDIR%|amdmi3|} diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile index a0487e71f509..5009b65d01b9 100644 --- a/graphics/luminance/Makefile +++ b/graphics/luminance/Makefile @@ -7,7 +7,7 @@ PORTNAME= luminance DISTVERSION= 2.0.1-1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION:S/-1//}/ DISTNAME= ${PORTNAME}-v${DISTVERSION} diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile index be7eff9eaea2..47c73fd9f757 100644 --- a/graphics/luxrender/Makefile +++ b/graphics/luxrender/Makefile @@ -7,6 +7,7 @@ PORTNAME= luxrender PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://src.luxrender.net/lux/archive/ \ http://freebsd.nsu.ru/distfiles/luxrender/ @@ -22,7 +23,7 @@ BROKEN= does not build with boost-1.48.0 BUILD_DEPENDS= ${LOCALBASE}/lib/libfreeimage.a:${PORTSDIR}/graphics/freeimage LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ HG_NODEID= 9206b3ba7011 diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile index a5761f06b027..4c5f2986780d 100644 --- a/graphics/makehuman/Makefile +++ b/graphics/makehuman/Makefile @@ -7,7 +7,7 @@ PORTNAME= makehuman DISTVERSION= 0.9.1-rc1a -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/MakeHuman%20Source/MakeHuman_091 diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index 0b9bea73eef2..6d13ec4f594d 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -7,7 +7,7 @@ PORTNAME= mapnik PORTVERSION= 2.0.1 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= graphics geography MASTER_SITES= http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/ @@ -19,7 +19,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg \ icuuc:${PORTSDIR}/devel/icu \ diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index eee904d4d6c0..7e2e6bab3e29 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -7,7 +7,7 @@ PORTNAME= mapserver PORTVERSION= 6.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics www geography MASTER_SITES= http://download.osgeo.org/mapserver/ @@ -16,7 +16,7 @@ COMMENT= System for developing web-based GIS applications LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ proj.7:${PORTSDIR}/graphics/proj \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ gif.5:${PORTSDIR}/graphics/giflib diff --git a/graphics/maverik/Makefile b/graphics/maverik/Makefile index 6d4a96b31088..0b89d7750e1c 100644 --- a/graphics/maverik/Makefile +++ b/graphics/maverik/Makefile @@ -31,7 +31,7 @@ MAKE_JOBS_UNSAFE= yes .include <bsd.port.pre.mk> .if defined(WITH_PNG) -LIB_DEPENDS+= png:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+= --PNGLIBS="-L${LOCALBASE}/lib -lpng" \ --PNGINCL="-I${LOCALBASE}/include" diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile index efa41f528a10..a3e962e9729b 100644 --- a/graphics/megapov/Makefile +++ b/graphics/megapov/Makefile @@ -7,7 +7,7 @@ PORTNAME= megapov PORTVERSION= 1.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://megapov.inetart.net/packages/unix/ @@ -15,7 +15,7 @@ MAINTAINER= maho@FreeBSD.org COMMENT= Unofficial extensions of POV-Ray RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ tiff:${PORTSDIR}/graphics/tiff @@ -26,9 +26,9 @@ GNU_CONFIGURE= yes ALL_TARGET= # empty CONFIGURE_ARGS+= COMPILED_BY="ports@FreeBSD.org" LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib -CFLAGS+= -I${LOCALBASE}/include -CXXFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 +CXXFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 .include <bsd.port.pre.mk> diff --git a/graphics/megapov/files/patch-png_pov.cpp b/graphics/megapov/files/patch-png_pov.cpp index 11ea26f73c34..e3d97aeaf664 100644 --- a/graphics/megapov/files/patch-png_pov.cpp +++ b/graphics/megapov/files/patch-png_pov.cpp @@ -1,6 +1,104 @@ ---- source/png_pov.cpp.orig 2005-08-23 20:20:33.000000000 +0100 -+++ source/png_pov.cpp 2010-11-24 10:15:11.000000000 +0000 -@@ -1437,7 +1437,7 @@ +--- source/png_pov.cpp.orig 2005-08-23 21:20:33.000000000 +0200 ++++ source/png_pov.cpp 2012-05-06 19:21:51.000000000 +0200 +@@ -54,6 +54,7 @@ + #include "povray.h" + #include "optout.h" + #include "png.h" ++#include "pngpriv.h" + #include "png_pov.h" + #include "pov_util.h" + #include "povmsend.h" +@@ -172,7 +173,7 @@ + if (png_get_error_ptr(png_ptr)) + PossibleError("libpng: %s",msg); + +- longjmp(png_ptr->jmpbuf,1); ++ longjmp(png_jmpbuf(png_ptr),1); + } + + +@@ -392,7 +393,7 @@ + Error("Cannot allocate PNG data structures"); + } + +- if (setjmp(o_png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(o_png_ptr))) + { + // If we get here, we had a problem reading the file + png_destroy_read_struct(&o_png_ptr, &info_ptr, (png_infopp)NULL); +@@ -442,7 +443,7 @@ + Error("Cannot allocate PNG data structures"); + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the file + png_destroy_read_struct(&o_png_ptr, &info_ptr, (png_infopp)NULL); +@@ -538,7 +539,7 @@ + Error("Cannot allocate PNG data structures"); + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the file + png_destroy_write_struct(&png_ptr, &info_ptr); +@@ -656,7 +657,7 @@ + case APPEND_MODE: + + #if defined(PNG_WRITE_FLUSH_SUPPORTED) +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the file + +@@ -765,7 +766,7 @@ + + if (png_ptr != NULL) + { +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the file + +@@ -1213,7 +1214,7 @@ + } + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the file + delete out_file; +@@ -1261,7 +1262,7 @@ + + register int col, j, step; + +- if (setjmp(o_png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(o_png_ptr))) + { + /* If we get here, we had a problem reading the file, which probably + * means that we have read all the available data, rather than a real +@@ -1270,7 +1271,7 @@ + return 0; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the new file + delete in_file; +@@ -1386,7 +1387,7 @@ + ((r_info_ptr = png_create_info_struct(r_png_ptr)) == NULL)) + Error("Cannot allocate PNG data structures"); + +- if(setjmp(r_png_ptr->jmpbuf)) ++ if(setjmp(png_jmpbuf(r_png_ptr))) + { + // If we get here, we had a problem reading the file + png_destroy_read_struct(&r_png_ptr, &r_info_ptr, (png_infopp)NULL); +@@ -1437,7 +1438,7 @@ if(r_info_ptr->valid & PNG_INFO_tRNS) { for (index = 0; index < r_info_ptr->num_trans; index++) @@ -9,7 +107,7 @@ } Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image"); -@@ -1470,7 +1470,7 @@ +@@ -1470,7 +1471,7 @@ if(r_info_ptr->valid & PNG_INFO_tRNS) { for (index = 0; index < r_info_ptr->num_trans; index++) diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile index 8e04c2995a3a..8b9a7dadb4e3 100644 --- a/graphics/meshviewer/Makefile +++ b/graphics/meshviewer/Makefile @@ -6,7 +6,7 @@ PORTNAME= meshviewer PORTVERSION= 0.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/mview/mview/${PORTVERSION} DISTNAME= mview-src-${PORTVERSION} diff --git a/graphics/metapixel/Makefile b/graphics/metapixel/Makefile index 40fd41a2878e..b90ec3315885 100644 --- a/graphics/metapixel/Makefile +++ b/graphics/metapixel/Makefile @@ -6,7 +6,7 @@ PORTNAME= metapixel PORTVERSION= 1.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.complang.tuwien.ac.at/schani/metapixel/files/ \ http://mirror.roe.ch/dist/metapixel/ @@ -14,12 +14,12 @@ MASTER_SITES= http://www.complang.tuwien.ac.at/schani/metapixel/files/ \ MAINTAINER= ports@FreeBSD.org COMMENT= A photomosaic generator -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ gif.5:${PORTSDIR}/graphics/giflib USE_GMAKE= yes -CPPFLAGS+= -I${LOCALBASE}/include -I. +CPPFLAGS+= -I${LOCALBASE}/include -I. -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \ diff --git a/graphics/metapixel/files/patch-rwpng.c b/graphics/metapixel/files/patch-rwpng.c new file mode 100644 index 000000000000..23e4803b9bd0 --- /dev/null +++ b/graphics/metapixel/files/patch-rwpng.c @@ -0,0 +1,64 @@ +--- rwimg/rwpng.c.orig 2006-12-10 18:59:54.000000000 +0100 ++++ rwimg/rwpng.c 2012-05-04 13:02:08.000000000 +0200 +@@ -26,6 +26,7 @@ + #include <stdlib.h> + + #include <png.h> ++#include <pngpriv.h> + + #include "rwpng.h" + +@@ -57,7 +58,7 @@ + data->end_info = png_create_info_struct(data->png_ptr); + assert(data->end_info != 0); + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + png_init_io(data->png_ptr, data->file); +@@ -84,7 +85,7 @@ + int bps, spp; + unsigned char *row; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB) +@@ -119,7 +120,7 @@ + { + png_data_t *data = (png_data_t*)_data; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + if (data->have_read) +@@ -148,7 +149,7 @@ + data->info_ptr = png_create_info_struct(data->png_ptr); + assert(data->info_ptr != 0); + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + if (pixel_stride == 4) +@@ -182,7 +183,7 @@ + png_data_t *data = (png_data_t*)_data; + int i; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + for (i = 0; i < num_lines; ++i) +@@ -194,7 +195,7 @@ + { + png_data_t *data = (png_data_t*)_data; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + png_write_end(data->png_ptr, data->info_ptr); diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile index 9b2ed3d96b5e..c721dc6e8677 100644 --- a/graphics/mhgui/Makefile +++ b/graphics/mhgui/Makefile @@ -7,7 +7,7 @@ PORTNAME= mhgui PORTVERSION= 0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/makehuman/MakeHuman%20Source/MakeHuman_091 @@ -15,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= GUI widget library for MakeHuman LIB_DEPENDS= animorph.0:${PORTSDIR}/graphics/animorph \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile index fa03d9c03f23..e27479b3f86d 100644 --- a/graphics/ming/Makefile +++ b/graphics/ming/Makefile @@ -7,7 +7,7 @@ PORTNAME= ming PORTVERSION= 0.4.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Releases/ @@ -16,7 +16,7 @@ COMMENT= Flash 4/5 movie output library with many languages support LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ gif.5:${PORTSDIR}/graphics/giflib \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png CONFLICTS= ja-ming-[0-9]* diff --git a/graphics/mingplot/Makefile b/graphics/mingplot/Makefile index 855b996dfab4..471a3d982a8e 100644 --- a/graphics/mingplot/Makefile +++ b/graphics/mingplot/Makefile @@ -7,6 +7,7 @@ PORTNAME= mingplot PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= http://0xcc.net/mingplot/ diff --git a/graphics/mirage/Makefile b/graphics/mirage/Makefile index 4c2124372c2a..a892c5360113 100644 --- a/graphics/mirage/Makefile +++ b/graphics/mirage/Makefile @@ -7,6 +7,7 @@ PORTNAME= mirage PORTVERSION= 0.9.5.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= BERLIOS/mirageiv diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile index f1c0302864d0..ae212f10d8e2 100644 --- a/graphics/morpheus/Makefile +++ b/graphics/morpheus/Makefile @@ -7,7 +7,7 @@ PORTNAME= morpheus PORTVERSION= 0.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics gnome MASTER_SITES= http://www.winnicki.net/morpheus/meat/ diff --git a/graphics/mscgen/Makefile b/graphics/mscgen/Makefile index 08aefdcf6fb7..3ea9a8ca9285 100644 --- a/graphics/mscgen/Makefile +++ b/graphics/mscgen/Makefile @@ -7,6 +7,7 @@ PORTNAME= mscgen PORTVERSION= 0.20 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.mcternan.me.uk/mscgen/software/ \ http://romain.blogreen.org/distfiles/ diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile index f1281c3821aa..49a29be102b9 100644 --- a/graphics/mtpaint/Makefile +++ b/graphics/mtpaint/Makefile @@ -7,6 +7,7 @@ PORTNAME= mtpaint PORTVERSION= 3.40 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -17,7 +18,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ gif.5:${PORTSDIR}/graphics/giflib \ freetype.9:${PORTSDIR}/print/freetype2 diff --git a/graphics/multivideo/Makefile b/graphics/multivideo/Makefile index 2a3febcb8e1c..c1d24e8928f5 100644 --- a/graphics/multivideo/Makefile +++ b/graphics/multivideo/Makefile @@ -8,7 +8,7 @@ PORTNAME= multivideo PORTVERSION= 0.1.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= http://www.lis.inpg.fr/pages_perso/bonnaud/multivideo/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile index 84048497d66c..9a96085c89d4 100644 --- a/graphics/mupdf/Makefile +++ b/graphics/mupdf/Makefile @@ -6,6 +6,7 @@ PORTNAME= mupdf PORTVERSION= 0.9 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE \ diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile index 0f744ab4c057..250eb1c6793c 100644 --- a/graphics/mypaint/Makefile +++ b/graphics/mypaint/Makefile @@ -7,6 +7,7 @@ PORTNAME= mypaint PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://download.gna.org/mypaint/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/nathive/Makefile b/graphics/nathive/Makefile index 8f60f2b135b5..97e3ad7e986f 100644 --- a/graphics/nathive/Makefile +++ b/graphics/nathive/Makefile @@ -7,7 +7,7 @@ PORTNAME= nathive PORTVERSION= 0.813 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.nathive.org/packages/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 8b642412b05c..9bff4e837de5 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -7,7 +7,7 @@ PORTNAME= netpbm PORTVERSION= 10.35.84 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION} EXTRACT_SUFX= .tgz @@ -17,7 +17,7 @@ COMMENT= A toolkit for conversion of images between different formats LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jbig.1:${PORTSDIR}/graphics/jbigkit \ jasper.4:${PORTSDIR}/graphics/jasper \ xml2.5:${PORTSDIR}/textproc/libxml2 diff --git a/graphics/netpbm/files/patch-pamrgbatopng.c b/graphics/netpbm/files/patch-pamrgbatopng.c new file mode 100644 index 000000000000..92e7590cf59b --- /dev/null +++ b/graphics/netpbm/files/patch-pamrgbatopng.c @@ -0,0 +1,8 @@ +--- converter/other/pamrgbatopng.c.orig 2006-08-19 05:12:28.000000000 +0200 ++++ converter/other/pamrgbatopng.c 2012-04-24 22:20:00.000000000 +0200 +@@ -1,4 +1,5 @@ + #include <png.h> ++#include <pngpriv.h> + #include <stdio.h> + #include <stdlib.h> + #include <setjmp.h> diff --git a/graphics/netpbm/files/patch-pngtopnm.c b/graphics/netpbm/files/patch-pngtopnm.c index b5387857e1b2..8c4615530bbe 100644 --- a/graphics/netpbm/files/patch-pngtopnm.c +++ b/graphics/netpbm/files/patch-pngtopnm.c @@ -1,6 +1,14 @@ ---- converter/other/pngtopnm.c.orig 2009-09-03 17:34:36.000000000 +0200 -+++ converter/other/pngtopnm.c 2010-05-21 11:24:05.000000000 +0200 -@@ -44,7 +44,7 @@ +--- converter/other/pngtopnm.c.orig 2011-11-25 01:15:46.000000000 +0100 ++++ converter/other/pngtopnm.c 2012-04-24 22:15:14.000000000 +0200 +@@ -37,6 +37,7 @@ + #include <math.h> + #include <float.h> + #include <png.h> /* includes zlib.h and setjmp.h */ ++#include <pngpriv.h> + #define VERSION "2.37.4 (5 December 1999) +netpbm" + + #include "pnm.h" +@@ -44,7 +45,7 @@ #include "nstring.h" #include "shhopt.h" @@ -9,7 +17,7 @@ #error Your PNG library (<png.h>) is incompatible with this Netpbm source code. #error You need either an older PNG library (older than 1.4) #error newer Netpbm source code (at least 10.48) -@@ -482,7 +482,7 @@ +@@ -489,7 +490,7 @@ bool retval; if (info_ptr->valid & PNG_INFO_tRNS) { @@ -18,7 +26,7 @@ /* There seems to be a problem here: you can't compare real -@@ -575,8 +575,8 @@ +@@ -582,8 +583,8 @@ for (i = 0, foundGray = FALSE; i < info_ptr->num_trans && !foundGray; ++i) { @@ -29,7 +37,7 @@ foundGray = TRUE; } } -@@ -647,7 +647,7 @@ +@@ -654,7 +655,7 @@ unsigned int i; trans_mix = TRUE; for (i = 0; i < info_ptr->num_trans; ++i) @@ -38,7 +46,7 @@ trans_mix = FALSE; break; } -@@ -885,7 +885,7 @@ +@@ -892,7 +893,7 @@ setXel(&xelrow[col], fgColor, bgColor, alpha_handling, ((info_ptr->valid & PNG_INFO_tRNS) && (fgColor.r == @@ -47,7 +55,7 @@ totalgamma))) ? 0 : maxval); } -@@ -914,7 +914,7 @@ +@@ -921,7 +922,7 @@ setXel(&xelrow[col], fgColor, bgColor, alpha_handling, (info_ptr->valid & PNG_INFO_tRNS) && index < info_ptr->num_trans ? diff --git a/graphics/netpbm/files/patch-pngtxt.c b/graphics/netpbm/files/patch-pngtxt.c new file mode 100644 index 000000000000..b3ae8ad5a51f --- /dev/null +++ b/graphics/netpbm/files/patch-pngtxt.c @@ -0,0 +1,10 @@ +--- converter/other/pngtxt.c.orig 2006-08-19 05:12:28.000000000 +0200 ++++ converter/other/pngtxt.c 2012-04-24 22:12:39.000000000 +0200 +@@ -2,6 +2,7 @@ + #include <string.h> + #include <stdio.h> + #include <png.h> ++#include <pngpriv.h> + + #include "nstring.h" + #include "pngtxt.h" diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile index 429f2ad63592..519996367535 100644 --- a/graphics/nip2/Makefile +++ b/graphics/nip2/Makefile @@ -7,6 +7,7 @@ PORTNAME= nip2 PORTVERSION= 7.26.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/ diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile index 5f7e02ca0e4f..33ea6a0bae80 100644 --- a/graphics/nvidia-texture-tools/Makefile +++ b/graphics/nvidia-texture-tools/Makefile @@ -7,6 +7,7 @@ PORTNAME= nvidia-texture-tools DISTVERSION= 2.0.8-1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE \ http://mirror.amdmi3.ru/distfiles/ @@ -14,7 +15,7 @@ MASTER_SITES= GOOGLE_CODE \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Texture Tools with support for DirectX 10 texture formats -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ IlmImf.6:${PORTSDIR}/graphics/OpenEXR @@ -23,8 +24,8 @@ USE_CMAKE= yes CMAKE_ARGS= -DNVTT_SHARED=TRUE MAKE_JOBS_SAFE= yes -CFLAGS+= -fPIC -CXXFLAGS+= -fPIC +CFLAGS+= -fPIC -I${LOCALBASE}/include/libpng15 +CXXFLAGS+= -fPIC -I${LOCALBASE}/include/libpng15 WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp b/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp new file mode 100644 index 000000000000..b4e288d62c52 --- /dev/null +++ b/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp @@ -0,0 +1,11 @@ +--- src/nvimage/ImageIO.cpp.orig 2010-05-14 19:59:28.000000000 +0200 ++++ src/nvimage/ImageIO.cpp 2012-05-06 20:50:40.000000000 +0200 +@@ -599,6 +599,8 @@ + + #if defined(HAVE_PNG) + ++#include "pngpriv.h" ++ + static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) + { + nvDebugCheck(png_ptr != NULL); diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index 00dec9e1bbf9..35cfee7734f1 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -8,7 +8,7 @@ PORTNAME= images PORTVERSION= 3.0.2 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/ \ @@ -32,6 +32,7 @@ USE_OCAML_WASH= yes OCAML_PKGDIRS= camlimages USE_OCAML_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes @@ -48,7 +49,7 @@ OPTIONS= PNG "Enable PNG support" on \ .include <bsd.port.options.mk> .if !defined(WITHOUT_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+= --with-png .else CONFIGURE_ARGS+= --without-png diff --git a/graphics/ocaml-images/files/patch-src_pngread.c b/graphics/ocaml-images/files/patch-src_pngread.c new file mode 100644 index 000000000000..2e5a49bf9c4f --- /dev/null +++ b/graphics/ocaml-images/files/patch-src_pngread.c @@ -0,0 +1,38 @@ +--- src/pngread.c.orig 2009-10-26 13:42:03.000000000 +0100 ++++ src/pngread.c 2012-05-05 07:08:53.000000000 +0200 +@@ -69,7 +69,7 @@ + } + + /* error handling */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + fclose(fp); +@@ -134,7 +134,7 @@ + png_set_rows(png_ptr, info_ptr, row_pointers); + + /* Later, we can return something */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + fclose(fp); +@@ -243,7 +243,7 @@ + } + + /* error handling */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + fclose(fp); +@@ -302,7 +302,7 @@ + png_set_rows(png_ptr, info_ptr, row_pointers); + + /* Later, we can return something */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + fclose(fp); diff --git a/graphics/ocaml-images/files/patch-src_pngwrite.c b/graphics/ocaml-images/files/patch-src_pngwrite.c new file mode 100644 index 000000000000..dc6872e299d7 --- /dev/null +++ b/graphics/ocaml-images/files/patch-src_pngwrite.c @@ -0,0 +1,20 @@ +--- src/pngwrite.c.orig 2009-10-26 13:42:03.000000000 +0100 ++++ src/pngwrite.c 2012-05-06 13:01:28.000000000 +0200 +@@ -62,7 +62,7 @@ + } + + /* error handling */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); +@@ -171,7 +171,7 @@ + } + + /* error handling */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); diff --git a/graphics/ocre/Makefile b/graphics/ocre/Makefile index 5f64189f6934..3e231822513b 100644 --- a/graphics/ocre/Makefile +++ b/graphics/ocre/Makefile @@ -7,6 +7,7 @@ PORTNAME= ocre PORTVERSION= 0.041 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://lem.eui.upm.es/pub/ocre/ DISTNAME= ${PORTNAME}_v${PORTVERSION:S/./_/} diff --git a/graphics/ocrfeeder/Makefile b/graphics/ocrfeeder/Makefile index e47aba0b75be..f7c708e95a6d 100644 --- a/graphics/ocrfeeder/Makefile +++ b/graphics/ocrfeeder/Makefile @@ -7,6 +7,7 @@ PORTNAME= ocrfeeder PORTVERSION= 0.7.7 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR=sources/ocrfeeder/${PORTVERSION:R} diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile index 2cf9bda77fc8..412c7065c21b 100644 --- a/graphics/ocropus/Makefile +++ b/graphics/ocropus/Makefile @@ -7,14 +7,14 @@ PORTNAME= ocropus PORTVERSION= 0.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= hiroto.kagotani@gmail.com COMMENT= The OCRopus(tm) open source document analysis and OCR system -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ iulib.0:${PORTSDIR}/graphics/iulib \ diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index b06bc76932f7..04669db90368 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -7,6 +7,7 @@ PORTNAME= okular PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile index 793ae746e2b3..84875cd338a2 100644 --- a/graphics/opencsg/Makefile +++ b/graphics/opencsg/Makefile @@ -7,7 +7,7 @@ PORTNAME= opencsg PORTVERSION= 1.3.1 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.opencsg.org/ DISTNAME= OpenCSG-${PORTVERSION} diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 565afcfb4ac1..36d3dd5f6fac 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -7,7 +7,7 @@ PORTNAME?= opencv PORTVERSION= 2.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION} DISTNAME= OpenCV-${DISTVERSION}a @@ -111,7 +111,7 @@ CMAKE_ARGS+= -DWITH_OPENEXR:BOOL=Off .endif .if !defined(WITHOUT_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CMAKE_ARGS+= -DWITH_PNG:BOOL=On .else CMAKE_ARGS+= -DWITH_PNG:BOOL=Off diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index ce13692eb87c..327b0f4b6ef8 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -8,7 +8,7 @@ PORTNAME= opendx PORTVERSION= 4.4.4 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics math MASTER_SITES= http://www.sfr-fresh.com/unix/misc/ DISTNAME= dx-${PORTVERSION} diff --git a/graphics/opengtl/Makefile b/graphics/opengtl/Makefile index 5176f9f2d298..fd48418c1037 100644 --- a/graphics/opengtl/Makefile +++ b/graphics/opengtl/Makefile @@ -6,6 +6,7 @@ PORTNAME= opengtl PORTVERSION= 0.9.16 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= http://download.${PORTNAME}.org/ DISTNAME= OpenGTL-${PORTVERSION} @@ -16,7 +17,7 @@ COMMENT= Graphics Transformation Languages LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png BUILD_DEPENDS= ${LOCALBASE}/lib/libLLVM-3.0.so:${PORTSDIR}/devel/llvm diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index e14e004c907b..9490d030cc30 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -7,7 +7,7 @@ PORTNAME= openimageio PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics multimedia MASTER_SITES= https://github.com/OpenImageIO/oiio/tarball/ DISTNAME= Release-${PORTVERSION} diff --git a/graphics/optar/Makefile b/graphics/optar/Makefile index 7a8731d0020a..69fe7afc18a4 100644 --- a/graphics/optar/Makefile +++ b/graphics/optar/Makefile @@ -7,7 +7,7 @@ PORTNAME= optar PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://xps.crucible.gr/ DISTFILES= optar.tgz \ @@ -17,7 +17,7 @@ EXTRACT_ONLY= optar.tgz MAINTAINER= antonakis@gmail.com COMMENT= A tool for encoding data on paper -BUILD_DEPENDS= ${LOCALBASE}/include/libpng/png.h:${PORTSDIR}/graphics/png +BUILD_DEPENDS= ${LOCALBASE}/include/libpng15/png.h:${PORTSDIR}/graphics/png RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick USE_GMAKE= yes diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile index 64e28afd032b..246b88c8ecaa 100644 --- a/graphics/optipng/Makefile +++ b/graphics/optipng/Makefile @@ -28,9 +28,10 @@ PORTDOCS= caveat.txt history.txt manual.html manual.pdf manual.txt \ .include <bsd.port.options.mk> .ifndef(WITH_BUNDLED_LIBPNG) +BROKEN= does not build with libpng 1.5.x CONFIGURE_ARGS+= --with-system-libpng CFLAGS+= "-I${LOCALBASE}/include" -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .endif .ifndef(WITH_BUNDLED_ZLIB) diff --git a/graphics/orca/Makefile b/graphics/orca/Makefile index 8ef452585520..4e8bf7bd9912 100644 --- a/graphics/orca/Makefile +++ b/graphics/orca/Makefile @@ -7,7 +7,7 @@ PORTNAME= orca PORTVERSION= 0.27 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.orcaware.com/orca/pub/ diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index 1d1084c19112..b64f9307afa3 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= osg PORTVERSION= 3.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.openscenegraph.org/downloads/developer_releases/ \ http://mirror.amdmi3.ru/distfiles/ @@ -18,7 +18,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff CONFLICTS= osg-[0-9]* diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index 8f3db2235dce..a44119a21373 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -7,7 +7,7 @@ PORTNAME= osg PORTVERSION= 3.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PORTVERSION}/source/ \ http://mirror.amdmi3.ru/distfiles/ @@ -17,7 +17,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff CONFLICTS= osg-devel-[0-9]* diff --git a/graphics/p5-Acme-Steganography-Image-Png/Makefile b/graphics/p5-Acme-Steganography-Image-Png/Makefile index 78acfc9db059..ff7c4280f6f4 100644 --- a/graphics/p5-Acme-Steganography-Image-Png/Makefile +++ b/graphics/p5-Acme-Steganography-Image-Png/Makefile @@ -7,7 +7,7 @@ PORTNAME= Acme-Steganography-Image-Png PORTVERSION= 0.06 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-CAD-Drawing-Template/Makefile b/graphics/p5-CAD-Drawing-Template/Makefile index b229d8da1735..b3a3c19ff06b 100644 --- a/graphics/p5-CAD-Drawing-Template/Makefile +++ b/graphics/p5-CAD-Drawing-Template/Makefile @@ -7,7 +7,7 @@ PORTNAME= CAD-Drawing-Template PORTVERSION= 0.01 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile index 56fb3c9aed12..f6c6a568a2b7 100644 --- a/graphics/p5-CAD-Drawing/Makefile +++ b/graphics/p5-CAD-Drawing/Makefile @@ -7,7 +7,7 @@ PORTNAME= CAD-Drawing PORTVERSION= 0.26 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile index 8159a96e448f..0964cfab9c9b 100644 --- a/graphics/p5-Cairo/Makefile +++ b/graphics/p5-Cairo/Makefile @@ -8,6 +8,7 @@ PORTNAME= Cairo PORTVERSION= 1.090 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= SF/gtk2-perl/${PORTNAME}/${PORTVERSION} \ CPAN diff --git a/graphics/p5-Chart-Clicker/Makefile b/graphics/p5-Chart-Clicker/Makefile index 021dbc98a49e..f8c5e7ee0b8d 100644 --- a/graphics/p5-Chart-Clicker/Makefile +++ b/graphics/p5-Chart-Clicker/Makefile @@ -7,6 +7,7 @@ PORTNAME= Chart-Clicker PORTVERSION= 2.81 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:GPHAT diff --git a/graphics/p5-Chart-Graph/Makefile b/graphics/p5-Chart-Graph/Makefile index 62f1bea94fd4..3765595ed56f 100644 --- a/graphics/p5-Chart-Graph/Makefile +++ b/graphics/p5-Chart-Graph/Makefile @@ -8,7 +8,7 @@ PORTNAME= Chart-Graph PORTVERSION= 3.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Chart-PNGgraph/Makefile b/graphics/p5-Chart-PNGgraph/Makefile index 4ad94b623a7c..ba84b7b03e0e 100644 --- a/graphics/p5-Chart-PNGgraph/Makefile +++ b/graphics/p5-Chart-PNGgraph/Makefile @@ -7,7 +7,7 @@ PORTNAME= Chart-PNGgraph PORTVERSION= 1.21 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Chart/Makefile b/graphics/p5-Chart/Makefile index b7da48f77532..f7bb37fa02bc 100644 --- a/graphics/p5-Chart/Makefile +++ b/graphics/p5-Chart/Makefile @@ -7,6 +7,7 @@ PORTNAME= Chart PORTVERSION= 2.4.5 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CHARTGRP diff --git a/graphics/p5-GD-Arrow/Makefile b/graphics/p5-GD-Arrow/Makefile index 1565109648db..edba2b14695e 100644 --- a/graphics/p5-GD-Arrow/Makefile +++ b/graphics/p5-GD-Arrow/Makefile @@ -8,7 +8,7 @@ PORTNAME= GD-Arrow PORTVERSION= 0.01 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-GD-Barcode/Makefile b/graphics/p5-GD-Barcode/Makefile index 630869b5212e..b7114bb22b0f 100644 --- a/graphics/p5-GD-Barcode/Makefile +++ b/graphics/p5-GD-Barcode/Makefile @@ -7,7 +7,7 @@ PORTNAME= GD-Barcode PORTVERSION= 1.15 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-GD-Graph-histogram/Makefile b/graphics/p5-GD-Graph-histogram/Makefile index 75c5430ac246..5c2842bcc87a 100644 --- a/graphics/p5-GD-Graph-histogram/Makefile +++ b/graphics/p5-GD-Graph-histogram/Makefile @@ -7,7 +7,7 @@ PORTNAME= GD-Graph-histogram PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:WHIZDOG diff --git a/graphics/p5-GD-Graph-ohlc/Makefile b/graphics/p5-GD-Graph-ohlc/Makefile index b1cf23e3b144..08bd6c843275 100644 --- a/graphics/p5-GD-Graph-ohlc/Makefile +++ b/graphics/p5-GD-Graph-ohlc/Makefile @@ -7,7 +7,7 @@ PORTNAME= GD-Graph-ohlc PORTVERSION= 0.9605 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:JETTERO diff --git a/graphics/p5-GD-Graph/Makefile b/graphics/p5-GD-Graph/Makefile index e05c19f2cec8..0e72400a73ed 100644 --- a/graphics/p5-GD-Graph/Makefile +++ b/graphics/p5-GD-Graph/Makefile @@ -8,7 +8,7 @@ PORTNAME= GD-Graph PORTVERSION= 1.44.01 DISTVERSION= ${PORTVERSION:C/\.(..)$/_\1/} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:BWARFIELD diff --git a/graphics/p5-GD-Graph3d/Makefile b/graphics/p5-GD-Graph3d/Makefile index 0103144c86b8..f948ebc7978f 100644 --- a/graphics/p5-GD-Graph3d/Makefile +++ b/graphics/p5-GD-Graph3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= GD-Graph3d PORTVERSION= 0.63 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-GD-SVG/Makefile b/graphics/p5-GD-SVG/Makefile index 04bb3335ea11..b000b6ac083c 100644 --- a/graphics/p5-GD-SVG/Makefile +++ b/graphics/p5-GD-SVG/Makefile @@ -8,7 +8,7 @@ PORTNAME= GD-SVG PORTVERSION= 0.33 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-GD-TextUtil/Makefile b/graphics/p5-GD-TextUtil/Makefile index 8810838455ba..eea18c37e0d5 100644 --- a/graphics/p5-GD-TextUtil/Makefile +++ b/graphics/p5-GD-TextUtil/Makefile @@ -7,7 +7,7 @@ PORTNAME= GD-TextUtil PORTVERSION= 0.86 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-GD-Thumbnail/Makefile b/graphics/p5-GD-Thumbnail/Makefile index c54adfdbf11b..7eebbaadcd50 100644 --- a/graphics/p5-GD-Thumbnail/Makefile +++ b/graphics/p5-GD-Thumbnail/Makefile @@ -7,7 +7,7 @@ PORTNAME= GD-Thumbnail PORTVERSION= 1.35 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile index 9dd61a0e800b..da82eb449606 100644 --- a/graphics/p5-GD/Makefile +++ b/graphics/p5-GD/Makefile @@ -7,6 +7,7 @@ PORTNAME= GD PORTVERSION= 2.46 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Graph-SocialMap/Makefile b/graphics/p5-Graph-SocialMap/Makefile index a7a37ffd8d4b..8bac5608abd4 100644 --- a/graphics/p5-Graph-SocialMap/Makefile +++ b/graphics/p5-Graph-SocialMap/Makefile @@ -7,7 +7,7 @@ PORTNAME= Graph-SocialMap PORTVERSION= 0.12 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Graph-Writer-GraphViz/Makefile b/graphics/p5-Graph-Writer-GraphViz/Makefile index c24b9b5c3e9e..8c68110ce46a 100644 --- a/graphics/p5-Graph-Writer-GraphViz/Makefile +++ b/graphics/p5-Graph-Writer-GraphViz/Makefile @@ -7,6 +7,7 @@ PORTNAME= Graph-Writer-GraphViz PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-GraphViz-Data-Structure/Makefile b/graphics/p5-GraphViz-Data-Structure/Makefile index 4884ebaf95a4..8eda891d0c34 100644 --- a/graphics/p5-GraphViz-Data-Structure/Makefile +++ b/graphics/p5-GraphViz-Data-Structure/Makefile @@ -8,7 +8,7 @@ PORTNAME= GraphViz-Data-Structure PORTVERSION= 0.17 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-GraphViz-Traverse/Makefile b/graphics/p5-GraphViz-Traverse/Makefile index ab04904340f9..4c28feb6e732 100644 --- a/graphics/p5-GraphViz-Traverse/Makefile +++ b/graphics/p5-GraphViz-Traverse/Makefile @@ -7,7 +7,7 @@ PORTNAME= GraphViz-Traverse PORTVERSION= 0.02 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile index c4b1fa965726..b1bfedcf872a 100644 --- a/graphics/p5-GraphViz/Makefile +++ b/graphics/p5-GraphViz/Makefile @@ -7,6 +7,7 @@ PORTNAME= GraphViz PORTVERSION= 2.10 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-GraphViz2/Makefile b/graphics/p5-GraphViz2/Makefile index 20b0c144dbef..ad21e1a1daf0 100644 --- a/graphics/p5-GraphViz2/Makefile +++ b/graphics/p5-GraphViz2/Makefile @@ -7,6 +7,7 @@ PORTNAME= GraphViz2 PORTVERSION= 2.02 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:RSAVAGE diff --git a/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile b/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile index cc9895d17ba9..eca85a75680b 100644 --- a/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile +++ b/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile @@ -7,6 +7,7 @@ PORTNAME= Graphics-Primitive-Driver-Cairo PORTVERSION= 0.44 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Image-Compare/Makefile b/graphics/p5-Image-Compare/Makefile index 4626237fbc8c..285a35a24216 100644 --- a/graphics/p5-Image-Compare/Makefile +++ b/graphics/p5-Image-Compare/Makefile @@ -7,6 +7,7 @@ PORTNAME= Image-Compare PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Image-Heatmap/Makefile b/graphics/p5-Image-Heatmap/Makefile index 5c2b5a76f27c..4fa223c3c0af 100644 --- a/graphics/p5-Image-Heatmap/Makefile +++ b/graphics/p5-Image-Heatmap/Makefile @@ -7,6 +7,7 @@ PORTNAME= Image-Heatmap PORTVERSION= 0.565 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile index 8484fcec4e28..eed0e7e2502e 100644 --- a/graphics/p5-Image-Imlib2/Makefile +++ b/graphics/p5-Image-Imlib2/Makefile @@ -7,7 +7,7 @@ PORTNAME= Image-Imlib2 PORTVERSION= 2.03 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile index ce170c881c30..e5897aaea198 100644 --- a/graphics/p5-Image-Magick-Iterator/Makefile +++ b/graphics/p5-Image-Magick-Iterator/Makefile @@ -7,7 +7,7 @@ PORTNAME= Image-Magick-Iterator PORTVERSION= 0.01 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= Image diff --git a/graphics/p5-Image-Scale/Makefile b/graphics/p5-Image-Scale/Makefile index dbfa2ce8fe5d..fbdf1391fefe 100644 --- a/graphics/p5-Image-Scale/Makefile +++ b/graphics/p5-Image-Scale/Makefile @@ -7,6 +7,7 @@ PORTNAME= Image-Scale PORTVERSION= 0.08 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -17,7 +18,7 @@ COMMENT= Perl module for fast, high-quality fixed-point image resizing LICENSE= GPLv2 LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ gif.5:${PORTSDIR}/graphics/giflib TEST_DEPENDS= p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings diff --git a/graphics/p5-Imager-AverageGray/Makefile b/graphics/p5-Imager-AverageGray/Makefile index fa403513c457..8c360e550207 100644 --- a/graphics/p5-Imager-AverageGray/Makefile +++ b/graphics/p5-Imager-AverageGray/Makefile @@ -7,7 +7,7 @@ PORTNAME= Imager-AverageGray PORTVERSION= 0.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Imager-Graph/Makefile b/graphics/p5-Imager-Graph/Makefile index 1857bfd15a2a..faad2c8e322a 100644 --- a/graphics/p5-Imager-Graph/Makefile +++ b/graphics/p5-Imager-Graph/Makefile @@ -7,6 +7,7 @@ PORTNAME= Imager-Graph PORTVERSION= 0.09 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Imager-Plot/Makefile b/graphics/p5-Imager-Plot/Makefile index c49c5cf849ad..d0229f9e39ec 100644 --- a/graphics/p5-Imager-Plot/Makefile +++ b/graphics/p5-Imager-Plot/Makefile @@ -8,7 +8,7 @@ PORTNAME= Imager-Plot PORTVERSION= 0.09 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Imager-QRCode/Makefile b/graphics/p5-Imager-QRCode/Makefile index 79796883a0ed..266227330ed3 100644 --- a/graphics/p5-Imager-QRCode/Makefile +++ b/graphics/p5-Imager-QRCode/Makefile @@ -7,6 +7,7 @@ PORTNAME= Imager-QRCode PORTVERSION= 0.03.3 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile index f2776b77fa06..012525958ea8 100644 --- a/graphics/p5-Imager/Makefile +++ b/graphics/p5-Imager/Makefile @@ -7,6 +7,7 @@ PORTNAME= Imager PORTVERSION= 0.90 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,7 +21,7 @@ LICENSE_COMB= dual LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ gif.5:${PORTSDIR}/graphics/giflib \ jpeg:${PORTSDIR}/graphics/jpeg \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ t1:${PORTSDIR}/devel/t1lib \ tiff:${PORTSDIR}/graphics/tiff diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile index b6a090c8f9e8..aea995d93307 100644 --- a/graphics/p5-Imlib2/Makefile +++ b/graphics/p5-Imlib2/Makefile @@ -7,7 +7,7 @@ PORTNAME= Imlib2 PORTVERSION= 1.0.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics perl5 MASTER_SITES= http://www.muhri.net/ PKGNAMEPREFIX= p5- diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile index 57305a955f67..a138882cbf29 100644 --- a/graphics/p5-PGPLOT/Makefile +++ b/graphics/p5-PGPLOT/Makefile @@ -7,7 +7,7 @@ PORTNAME= PGPLOT PORTVERSION= 2.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:KGB diff --git a/graphics/p5-SpringGraph/Makefile b/graphics/p5-SpringGraph/Makefile index 1827a2dad930..ba9914273e33 100644 --- a/graphics/p5-SpringGraph/Makefile +++ b/graphics/p5-SpringGraph/Makefile @@ -8,7 +8,7 @@ PORTNAME= SpringGraph PORTVERSION= 0.05 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= GraphViz/TEEJAY diff --git a/graphics/p5-Tk-JPEG-Lite/Makefile b/graphics/p5-Tk-JPEG-Lite/Makefile index 94b756521630..37164c623a21 100644 --- a/graphics/p5-Tk-JPEG-Lite/Makefile +++ b/graphics/p5-Tk-JPEG-Lite/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-JPEG-Lite PORTVERSION= 2.01403 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-chart/Makefile b/graphics/p5-chart/Makefile index b7da48f77532..f7bb37fa02bc 100644 --- a/graphics/p5-chart/Makefile +++ b/graphics/p5-chart/Makefile @@ -7,6 +7,7 @@ PORTNAME= Chart PORTVERSION= 2.4.5 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CHARTGRP diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile index ba3843025e3c..0b08bb75531f 100644 --- a/graphics/p5-ming/Makefile +++ b/graphics/p5-ming/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ming -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics perl5 PKGNAMEPREFIX= p5- diff --git a/graphics/panoglview/Makefile b/graphics/panoglview/Makefile index c26c71e329d0..b4cce8bce568 100644 --- a/graphics/panoglview/Makefile +++ b/graphics/panoglview/Makefile @@ -7,6 +7,7 @@ PORTNAME= panoglview PORTVERSION= 0.2.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile index 265c325645e2..96da913ce9c0 100644 --- a/graphics/passepartout/Makefile +++ b/graphics/passepartout/Makefile @@ -8,7 +8,7 @@ PORTNAME= passepartout PORTVERSION= 0.7.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/pdf2svg/Makefile b/graphics/pdf2svg/Makefile index f2afd5f4d2ac..c9ce08a85079 100644 --- a/graphics/pdf2svg/Makefile +++ b/graphics/pdf2svg/Makefile @@ -6,7 +6,7 @@ PORTNAME= pdf2svg PORTVERSION= 0.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://www.cityinthesky.co.uk/_media/opensource/ diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile index 6e1b0e09a8f6..a1a995037dfc 100644 --- a/graphics/pear-Image_Canvas/Makefile +++ b/graphics/pear-Image_Canvas/Makefile @@ -7,6 +7,7 @@ PORTNAME= Image_Canvas PORTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= graphics www pear MAINTAINER= numisemis@yahoo.com diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile index 82b98bd33864..5278d5e3b232 100644 --- a/graphics/pencil/Makefile +++ b/graphics/pencil/Makefile @@ -7,7 +7,7 @@ PORTNAME= pencil PORTVERSION= 0.4.4b -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}-planner/Pencil/${PORTVERSION}eta DISTNAME= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFFIX} @@ -18,7 +18,7 @@ COMMENT= Pencil - a traditional 2D animation software LICENSE= GPLv2 LIB_DEPENDS+= ming:${PORTSDIR}/graphics/ming \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ iconv:${PORTSDIR}/converters/libiconv \ diff --git a/graphics/peps/Makefile b/graphics/peps/Makefile index d8504c2380d7..dd8e4e349f67 100644 --- a/graphics/peps/Makefile +++ b/graphics/peps/Makefile @@ -7,7 +7,7 @@ PORTNAME= peps PORTVERSION= 2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://peps.redprince.net/peps/ \ ftp://ftp.peps.redprince.net/unix/peps/ diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile index c237bd1bc69c..1532f2df4448 100644 --- a/graphics/pgplot/Makefile +++ b/graphics/pgplot/Makefile @@ -7,7 +7,7 @@ PORTNAME= pgplot PORTVERSION= 5.2.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= ftp://ftp.astro.caltech.edu/pub/pgplot/ DISTNAME= ${PORTNAME}${PORTVERSION:R} @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:R} MAINTAINER= bf@FreeBSD.org COMMENT= A C/FORTRAN library for drawing graphs on a variety of display devices -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png MAKE_JOBS_UNSAFE= yes diff --git a/graphics/pho/Makefile b/graphics/pho/Makefile index 0524cef3f77a..f4a6b03a9d0d 100644 --- a/graphics/pho/Makefile +++ b/graphics/pho/Makefile @@ -7,6 +7,7 @@ PORTNAME= pho DISTVERSION= 0.9.7-pre7 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://shallowsky.com/software/pho/ diff --git a/graphics/php5-swfed/Makefile b/graphics/php5-swfed/Makefile index 2c68f3f03c3f..143d048ef35c 100644 --- a/graphics/php5-swfed/Makefile +++ b/graphics/php5-swfed/Makefile @@ -7,6 +7,7 @@ PORTNAME= swfed PORTVERSION= 0.57 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= SFJP MASTER_SITE_SUBDIR= ${PORTNAME}/55622 @@ -19,7 +20,7 @@ LICENSE= PHP301 BUILD_DEPENDS= re2c:${PORTSDIR}/devel/re2c LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png DEFAULT_PHP_VER= 5 IGNORE_WITH_PHP= 4 diff --git a/graphics/picpuz/Makefile b/graphics/picpuz/Makefile index 4cebb2c37439..c29e7677ccd8 100644 --- a/graphics/picpuz/Makefile +++ b/graphics/picpuz/Makefile @@ -7,7 +7,7 @@ PORTNAME= picpuz PORTVERSION= 2.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics games MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/ diff --git a/graphics/picturebook/Makefile b/graphics/picturebook/Makefile index 0b15d95ce455..95d44b6e3912 100644 --- a/graphics/picturebook/Makefile +++ b/graphics/picturebook/Makefile @@ -7,7 +7,7 @@ PORTNAME= picturebook PORTVERSION= 20010422 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://samba.org/picturebook/ DISTNAME= capture diff --git a/graphics/picviz/Makefile b/graphics/picviz/Makefile index cf78f0fcf011..8ed735961321 100644 --- a/graphics/picviz/Makefile +++ b/graphics/picviz/Makefile @@ -7,7 +7,7 @@ PORTNAME= picviz PORTVERSION= 0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics security MASTER_SITES= http://www.wallinfire.net/picviz/attachment/wiki/ReleasesDownload/ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}?format=raw diff --git a/graphics/pinpoint/Makefile b/graphics/pinpoint/Makefile index 1a02558c5cfa..d246f0a1a473 100644 --- a/graphics/pinpoint/Makefile +++ b/graphics/pinpoint/Makefile @@ -7,6 +7,7 @@ PORTNAME= pinpoint DISTVERSION= 0.1.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GNOME diff --git a/graphics/pixelize/Makefile b/graphics/pixelize/Makefile index 520264efcd23..fdefbcd5983b 100644 --- a/graphics/pixelize/Makefile +++ b/graphics/pixelize/Makefile @@ -8,6 +8,7 @@ PORTNAME= pixelize PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://lashwhip.com/pub/ \ http://www.c-s.li/ports/ \ diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile index 566513aa9bad..c9ad77571d81 100644 --- a/graphics/pixie/Makefile +++ b/graphics/pixie/Makefile @@ -7,7 +7,7 @@ PORTNAME= pixie PORTVERSION= 2.2.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION} DISTNAME= Pixie-src-${PORTVERSION} diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index fca4f488b6a4..403c7f4189a9 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -7,7 +7,7 @@ PORTNAME= plotutils PORTVERSION= 2.6 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GNU @@ -15,7 +15,7 @@ MASTER_SITES= GNU MAINTAINER= stephen@FreeBSD.org COMMENT= A plotting library and toolkit -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_MOTIF= yes USE_AUTOTOOLS= libtool @@ -25,6 +25,7 @@ USE_LDCONFIG= yes MAN1= ode.1 plot.1 plotfont.1 spline.1 tek2plot.1 INFO= libxmi plotutils +#CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/plotutils/files/patch-libplot-z_write.c b/graphics/plotutils/files/patch-libplot-z_write.c new file mode 100644 index 000000000000..787771bab997 --- /dev/null +++ b/graphics/plotutils/files/patch-libplot-z_write.c @@ -0,0 +1,29 @@ +--- libplot/z_write.c.orig 2008-07-16 02:54:10.000000000 +0200 ++++ libplot/z_write.c 2012-04-27 19:12:55.000000000 +0200 +@@ -164,7 +164,7 @@ + } + + /* cleanup after libpng errors (error handler does a longjmp) */ +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + { + png_destroy_write_struct (&png_ptr, (png_info **)NULL); + return -1; +@@ -444,7 +444,7 @@ + #endif + } + +- longjmp (png_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf(png_ptr), 1); + } + + static void +@@ -515,7 +515,7 @@ + #endif + } + +- longjmp (png_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf(png_ptr), 1); + } + + static void diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 02145532f074..4ef14f656bf2 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -6,9 +6,9 @@ # PORTNAME= png -PORTVERSION= 1.4.11 +PORTVERSION= 1.5.10 CATEGORIES= graphics -MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}14/${PORTVERSION} +MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}15/${PORTVERSION} DISTNAME= lib${PORTNAME}-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -18,50 +18,63 @@ COMMENT= Library for manipulating PNG images MAKE_JOBS_SAFE= yes USE_XZ= yes +GNU_CONFIGURE= yes +USE_CMAKE= yes USE_LDCONFIG= yes -MAKEFILE= ${WRKSRC}/scripts/makefile.freebsd -ALL_TARGET= all libpng-config test -MAKE_FLAGS= ccopts="${CFLAGS}" ldopts="${LDFLAGS}" -f SHLIB_VER= 6 -MAKE_ENV= SHLIB_VER="${SHLIB_VER}" -PLIST_SUB= SHLIB_VER="${SHLIB_VER}" +CMAKE_ARGS+= -DPNG_MAN_DIR:STRING=man MAN3= libpng.3 libpngpf.3 MAN5= png.5 -MANCOMPRESSED= maybe OPTIONS= APNG "Animated PNG support" On -APNGDISTNAME= ${DISTNAME}-apng.patch - .include <bsd.port.pre.mk> .if !defined(WITHOUT_APNG) || make(makesum) || defined(FETCH_ALL) -MASTER_SITES+= SF/apng/libpng/libpng14:apng -DISTFILES+= ${APNGDISTNAME}.gz:apng +MASTER_SITES+= SF/lib${PORTNAME}-apng/libpng15/${PORTVERSION}:apng +DISTFILES+= ${DISTNAME}-apng.patch.gz:apng EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} .endif .if !defined(WITHOUT_APNG) -EXTRA_PATCHES= ${WRKSRC}/${APNGDISTNAME} +EXTRA_PATCHES= ${WRKSRC}/${DISTNAME}-apng.patch .endif post-extract: .if !defined(WITHOUT_APNG) @${LN} -sf ${WRKSRC} ${WRKSRC}/ - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${APNGDISTNAME}.gz ${WRKSRC}/ - ${GZIP_CMD} -d ${WRKSRC}/${APNGDISTNAME}.gz + ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}-apng.patch.gz ${WRKSRC}/ + ${GZIP_CMD} -d ${WRKSRC}/${DISTNAME}-apng.patch.gz .endif +post-patch: + ${REINPLACE_CMD} \ + -e 's|RELEASE}.0|RELEASE}|' \ + -e 's|LIBDIR}/pkgconfig|LIBDIR}data/pkgconfig|' \ + ${WRKSRC}/CMakeLists.txt + +post-build: + @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \ + if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ + ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ + (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + fi; \ + ${FALSE}; \ + fi) + pre-su-install: @${MKDIR} ${PREFIX}/include/libpng @${MKDIR} ${PREFIX}/libdata/pkgconfig post-install: - ${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/scripts/libpng.pc.in \ - > ${WRKSRC}/scripts/libpng.pc - ${INSTALL_DATA} ${WRKSRC}/scripts/libpng.pc \ - ${PREFIX}/libdata/pkgconfig/libpng14.pc - ${LN} -sf libpng14.pc ${PREFIX}/libdata/pkgconfig/libpng.pc + ${INSTALL_DATA} ${WRKSRC}/pngdebug.h ${WRKSRC}/pnginfo.h \ + ${WRKSRC}/pngpriv.h ${WRKSRC}/pngstruct.h \ + ${PREFIX}/include/libpng15/ + ${RMDIR} ${PREFIX}/include/libpng + ${RM} ${PREFIX}/libdata/pkgconfig/libpng.pc + ${LN} -sf libpng15.pc ${PREFIX}/libdata/pkgconfig/libpng.pc + ${RM} ${PREFIX}/lib/libpng15.so.15 + ${MV} ${PREFIX}/lib/libpng15.so.15.10 ${PREFIX}/lib/libpng15.so.15 .include <bsd.port.post.mk> diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 1ea447a092b1..f6630fe54659 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,4 +1,4 @@ -SHA256 (libpng-1.4.11.tar.xz) = 4200ca1c758ffda2a85af573bf057bbe00f209d6d1b8e2d7d75ace38115e5eb1 -SIZE (libpng-1.4.11.tar.xz) = 548088 -SHA256 (libpng-1.4.11-apng.patch.gz) = 4e697de6d5fd87231aaee5055f17c3de1fd61c19757f5506f3e6239277fced91 -SIZE (libpng-1.4.11-apng.patch.gz) = 9199 +SHA256 (libpng-1.5.10.tar.xz) = dd49c39710a6ef8a550923ba17d3496b08ce769e47122d9150df4763bf49605d +SIZE (libpng-1.5.10.tar.xz) = 702752 +SHA256 (libpng-1.5.10-apng.patch.gz) = 0464b2df97853c426f35f97d12800b4dcb5760fc4c787fc4987ae0fb870a997f +SIZE (libpng-1.5.10-apng.patch.gz) = 10127 diff --git a/graphics/png/files/patch-libpng.pc.in b/graphics/png/files/patch-libpng.pc.in deleted file mode 100644 index 372f46391835..000000000000 --- a/graphics/png/files/patch-libpng.pc.in +++ /dev/null @@ -1,18 +0,0 @@ ---- scripts/libpng.pc.in.orig 2009-12-03 02:46:02.000000000 +0100 -+++ scripts/libpng.pc.in 2010-01-12 13:49:36.000000000 +0100 -@@ -1,10 +1,10 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@/libpng14 -+prefix=@PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include/libpng - - Name: libpng - Description: Loads and saves PNG files - Version: 1.4.11 --Libs: -L${libdir} -lpng14 -+Libs: -L${libdir} -lpng -lz -lm - Cflags: -I${includedir} diff --git a/graphics/png/files/patch-makefile.freebsd b/graphics/png/files/patch-makefile.freebsd index d81023af2185..e35f35b313ba 100644 --- a/graphics/png/files/patch-makefile.freebsd +++ b/graphics/png/files/patch-makefile.freebsd @@ -1,5 +1,5 @@ ---- scripts/makefile.freebsd.orig 2010-01-03 06:05:38.000000000 +0100 -+++ scripts/makefile.freebsd 2010-01-18 13:25:13.000000000 +0100 +--- scripts/makefile.freebsd.orig 2011-01-06 14:02:38.000000000 +0100 ++++ scripts/makefile.freebsd 2011-01-07 11:16:17.000000000 +0100 @@ -11,17 +11,17 @@ LIB= png SHLIB_MAJOR= ${SHLIB_VER} @@ -14,7 +14,7 @@ -LIBDIR= /lib +#DESTDIR= ${PREFIX} +LIBDIR= ${PREFIX}/lib - INCS= png.h pngconf.h pngpriv.h + INCS= png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -INCSDIR= /include/libpng +INCSDIR= ${PREFIX}/include/libpng INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk @@ -22,9 +22,9 @@ -MANDIR= /man/man +MANDIR= ${PREFIX}/man/man SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ - libpng/pngconf.h ${INCSDIR}/../pngconf.h - LDADD+= -lm -lz -@@ -45,4 +45,22 @@ + libpng/pngconf.h ${INCSDIR}/../pngconf.h \ + libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h +@@ -50,4 +50,22 @@ writelock: chmod a-w *.[ch35] $(DOCS) scripts/* @@ -44,6 +44,6 @@ +beforeinstall: libpng-config + ${BSD_INSTALL_SCRIPT} \ + libpng-config ${PREFIX}/bin -+ ln -sf libpng-config ${PREFIX}/bin/libpng14-config ++ ln -sf libpng-config ${PREFIX}/bin/libpng15-config + .include <bsd.lib.mk> diff --git a/graphics/png/files/patch-pngrutil.c b/graphics/png/files/patch-pngrutil.c deleted file mode 100644 index 677cbfd3919b..000000000000 --- a/graphics/png/files/patch-pngrutil.c +++ /dev/null @@ -1,20 +0,0 @@ ----pngrutil.c.orig 2012/02/10 19:43:42 121491 -+++ pngrutil.c 2012/02/10 19:45:46 121492 -@@ -363,8 +363,15 @@ - { - /* Success (maybe) - really uncompress the chunk. */ - png_size_t new_size = 0; -- png_charp text = png_malloc_warn(png_ptr, -- prefix_size + expanded_size + 1); -+ png_charp text = NULL; -+ /* Need to check for both truncation (64-bit platforms) and integer -+ * overflow. -+ */ -+ if (prefix_size + expanded_size > prefix_size && -+ prefix_size + expanded_size < 0xffffffffU) -+ { -+ text = png_malloc_warn(png_ptr, prefix_size + expanded_size + 1); -+ } - - if (text != NULL) - { diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist index 8dcab4dfa031..9bc30bd4dc93 100644 --- a/graphics/png/pkg-plist +++ b/graphics/png/pkg-plist @@ -1,17 +1,23 @@ -@unexec rm -f %D/bin/libpng14-config bin/libpng-config -@exec ln -sf %f %D/bin/libpng14-config -include/libpng/png.h -@exec ln -sf libpng/%f %D/include/%f -@unexec rm -f %D/include/%f -include/libpng/pngconf.h -@exec ln -sf libpng/%f %D/include/%f -@unexec rm -f %D/include/%f -include/libpng/pngpriv.h +bin/libpng15-config +include/libpng15/png.h +include/libpng15/pngconf.h +include/libpng15/pngdebug.h +include/libpng15/pnginfo.h +include/libpng15/pnglibconf.h +include/libpng15/pngpriv.h +include/libpng15/pngstruct.h +include/png.h +include/pngconf.h +include/pnglibconf.h lib/libpng.a lib/libpng.so -lib/libpng.so.%%SHLIB_VER%% -libdata/pkgconfig/libpng14.pc -@exec ln -sf %f %D/libdata/pkgconfig/libpng.pc -@unexec rm -f %D/libdata/pkgconfig/libpng.pc -@dirrm include/libpng +libdata/pkgconfig/libpng15.pc +libdata/pkgconfig/libpng.pc +lib/libpng/libpng15-release.cmake +lib/libpng/libpng15.cmake +lib/libpng15.a +lib/libpng15.so +lib/libpng15.so.15 +@dirrm lib/libpng +@dirrm include/libpng15 diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile index 6765d8849fc2..86960fce7a6e 100644 --- a/graphics/png2html/Makefile +++ b/graphics/png2html/Makefile @@ -7,7 +7,7 @@ PORTNAME= png2html PORTVERSION= 1.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://www.geoffholden.com/content/projects/png2html/ @@ -17,7 +17,7 @@ COMMENT= Takes a PNG image and transforms it into HTML LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ gd.4:${PORTSDIR}/graphics/gd PLIST_FILES= bin/png2html diff --git a/graphics/png2ico/Makefile b/graphics/png2ico/Makefile index ede02d0c20ce..b0787bb26e66 100644 --- a/graphics/png2ico/Makefile +++ b/graphics/png2ico/Makefile @@ -7,7 +7,7 @@ PORTNAME= png2ico PORTVERSION= 2002.12.08 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.winterdrache.de/freeware/png2ico/data/ DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/./-/g} @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/./-/g} MAINTAINER= klammer@webonaut.com COMMENT= Converts PNG files to Windows icon resource files -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png MAN1= png2ico.1 PLIST_FILES= bin/png2ico diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile index bf78fa8288ab..81f19aae2cce 100644 --- a/graphics/pngcrush/Makefile +++ b/graphics/pngcrush/Makefile @@ -7,6 +7,7 @@ PORTNAME= pngcrush PORTVERSION= 1.7.28 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/pmt/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-nolib @@ -14,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-nolib MAINTAINER= jsa@FreeBSD.org COMMENT= An optimizer for PNG files -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_XZ= yes USE_GMAKE= yes diff --git a/graphics/pngnq/Makefile b/graphics/pngnq/Makefile index 57e05cd768a5..7fd70f505e47 100644 --- a/graphics/pngnq/Makefile +++ b/graphics/pngnq/Makefile @@ -7,6 +7,7 @@ PORTNAME= pngnq PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -15,7 +16,7 @@ COMMENT= A tool for quantizing PNG images in RGBA format LICENSE= BSD -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes diff --git a/graphics/pngnq/files/patch-rwpng.c b/graphics/pngnq/files/patch-rwpng.c new file mode 100644 index 000000000000..563f04f9fb14 --- /dev/null +++ b/graphics/pngnq/files/patch-rwpng.c @@ -0,0 +1,10 @@ +--- src/rwpng.c.orig 2010-05-11 00:42:56.000000000 +0200 ++++ src/rwpng.c 2012-04-25 19:10:41.000000000 +0200 +@@ -33,6 +33,7 @@ + #include <stdlib.h> + + #include "png.h" /* libpng header; includes zlib.h */ ++#include "zlib.h" + #include "rwpng.h" /* typedefs, common macros, public prototypes */ + + /* future versions of libpng will provide this macro: */ diff --git a/graphics/pngquant/Makefile b/graphics/pngquant/Makefile index 54dd47dc88d0..ccb6b6c3f00c 100644 --- a/graphics/pngquant/Makefile +++ b/graphics/pngquant/Makefile @@ -7,6 +7,7 @@ PORTNAME= pngquant PORTVERSION= 1.7.2 +PORTREVISION= 1 DISTVERSIONSUFFIX= -src CATEGORIES= graphics MASTER_SITES= http://pngquant.org/ @@ -17,7 +18,7 @@ COMMENT= Converts 32-bit RGBA PNGs into 8-bit RGBA-palette PNGs LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYRIGHT -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png OPTIONS= OPTIMIZED_CFLAGS "Additional optimization" off \ OPENMP "Enable OpenMP support" off \ diff --git a/graphics/pngrewrite/Makefile b/graphics/pngrewrite/Makefile index b448675d33ba..8a81f183c872 100644 --- a/graphics/pngrewrite/Makefile +++ b/graphics/pngrewrite/Makefile @@ -7,6 +7,7 @@ PORTNAME= pngrewrite PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://entropymine.com/jason/pngrewrite/ \ http://mirror.roe.ch/dist/pngrewrite/ @@ -14,7 +15,7 @@ MASTER_SITES= http://entropymine.com/jason/pngrewrite/ \ MAINTAINER= bapt@FreeBSD.org COMMENT= A PNG palette optimizer -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_ZIP= yes NO_WRKSUBDIR= yes diff --git a/graphics/pngwriter/Makefile b/graphics/pngwriter/Makefile index 4ca373f71034..9db6905ca1e6 100644 --- a/graphics/pngwriter/Makefile +++ b/graphics/pngwriter/Makefile @@ -8,20 +8,20 @@ PORTNAME= pngwriter PORTVERSION= 0.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A C++ library for creating PNG images -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_GNOME= pkgconfig -CXXFLAGS+= `pkg-config --cflags freetype2 libpng14` -I${LOCALBASE}/include +CXXFLAGS+= `pkg-config --cflags freetype2 libpng15` -I${LOCALBASE}/include PORTDOCS= * PORTEXAMPLES= * diff --git a/graphics/pngwriter/files/patch-pngwriter.cc b/graphics/pngwriter/files/patch-pngwriter.cc index 8ea130fba529..135ab18302c3 100644 --- a/graphics/pngwriter/files/patch-pngwriter.cc +++ b/graphics/pngwriter/files/patch-pngwriter.cc @@ -1,5 +1,31 @@ --- src/pngwriter.cc.orig 2009-02-10 22:45:16.000000000 +0100 -+++ src/pngwriter.cc 2010-03-29 15:55:32.000000000 +0200 ++++ src/pngwriter.cc 2012-05-07 20:50:38.000000000 +0200 +@@ -988,19 +988,19 @@ + time(&gmt); + png_convert_from_time_t(&mod_time, gmt); + png_set_tIME(png_ptr, info_ptr, &mod_time); +- text_ptr[0].key = "Title"; ++ text_ptr[0].key = (char*)"Title"; + text_ptr[0].text = texttitle_; + text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE; +- text_ptr[1].key = "Author"; ++ text_ptr[1].key = (char*)"Author"; + text_ptr[1].text = textauthor_; + text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE; +- text_ptr[2].key = "Description"; ++ text_ptr[2].key = (char*)"Description"; + text_ptr[2].text = textdescription_; + text_ptr[2].compression = PNG_TEXT_COMPRESSION_NONE; +- text_ptr[3].key = "Creation Time"; +- text_ptr[3].text = png_convert_to_rfc1123(png_ptr, &mod_time); ++ text_ptr[3].key = (char*)"Creation Time"; ++ text_ptr[3].text = (char *)png_convert_to_rfc1123(png_ptr, &mod_time); + text_ptr[3].compression = PNG_TEXT_COMPRESSION_NONE; +- text_ptr[4].key = "Software"; ++ text_ptr[4].key = (char*)"Software"; + text_ptr[4].text = textsoftware_; + text_ptr[4].compression = PNG_TEXT_COMPRESSION_NONE; + png_set_text(png_ptr, info_ptr, text_ptr, 5); @@ -1204,8 +1204,8 @@ FILE *fp; png_structp png_ptr; @@ -20,3 +46,12 @@ transformation_ = 1; } +@@ -1530,7 +1530,7 @@ + fclose(fp); + return 0; + } +- if (setjmp((*png_ptr)->jmpbuf)) /*(setjmp(png_jmpbuf(*png_ptr)) )*////////////////////////////////////// ++ if (setjmp( png_jmpbuf((*png_ptr)))) + { + png_destroy_read_struct(png_ptr, info_ptr, (png_infopp)NULL); + std::cerr << " PNGwriter::read_png_info - ERROR **: This file may be a corrupted PNG file. (setjmp(*png_ptr)->jmpbf) failed)." << std::endl; diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index f602733c3e46..f1999cdb0853 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -7,7 +7,7 @@ PORTNAME= podofo PORTVERSION= 0.9.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics print MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} @@ -50,7 +50,7 @@ CMAKE_ARGS+= -DWANT_TIFF:BOOL=TRUE .endif .if !defined(WITHOUT_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CMAKE_ARGS+= -DWANT_PNG:BOOL=TRUE .endif diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile index c46088d8b9f4..0118fa24b6f0 100644 --- a/graphics/poppler-glib/Makefile +++ b/graphics/poppler-glib/Makefile @@ -6,7 +6,7 @@ # $MCom$ # -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -glib MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile index d045b363ca64..9f2274b9a69d 100644 --- a/graphics/poppler-qt4/Makefile +++ b/graphics/poppler-qt4/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/graphics/poppler-qt4/Makefile,v 1.15 2010/07/07 13:03:19 kwm Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -qt4 MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile index 263fca70ea32..fafe6bcf1415 100644 --- a/graphics/poppler-utils/Makefile +++ b/graphics/poppler-utils/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/graphics/poppler-utils/Makefile,v 1.5 2010/07/07 13:03:19 kwm Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -utils MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 227283129c63..f72bb073e9d9 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -8,7 +8,7 @@ PORTNAME= poppler PORTVERSION= 0.18.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile index eec21308517f..bdadf926e4ae 100644 --- a/graphics/pornview/Makefile +++ b/graphics/pornview/Makefile @@ -7,7 +7,7 @@ PORTNAME= pornview PORTVERSION= 0.2.0.p.1 -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/OldFiles DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/} @@ -15,8 +15,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/} MAINTAINER= dinoex@FreeBSD.org COMMENT= PornView is an image viewer/manager -LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif -LIB_DEPENDS+= xcb-render-util:${PORTSDIR}/x11/xcb-util-renderutil +LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ + png15:${PORTSDIR}/graphics/png \ + xcb-render-util:${PORTSDIR}/x11/xcb-util-renderutil USE_XORG= x11 xi xext xinerama USE_GNOME= gtk20 diff --git a/graphics/pornview/files/patch-pixbuf_utils.c b/graphics/pornview/files/patch-pixbuf_utils.c new file mode 100644 index 000000000000..605265e93a68 --- /dev/null +++ b/graphics/pornview/files/patch-pixbuf_utils.c @@ -0,0 +1,19 @@ +--- src/support/pixbuf_utils.c.orig 2002-12-13 13:29:28.000000000 +0100 ++++ src/support/pixbuf_utils.c 2012-05-09 12:38:26.000000000 +0200 +@@ -18,6 +18,7 @@ + #endif + + #include <png.h> ++#include <pngpriv.h> + #include <gtk/gtk.h> + #include <gdk-pixbuf/gdk-pixbuf.h> + +@@ -60,7 +61,7 @@ + return FALSE; + } + +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + { + png_destroy_write_struct (&png_ptr, &info_ptr); + fclose (handle); diff --git a/graphics/potracegui/Makefile b/graphics/potracegui/Makefile index 218de4d37f68..d75ec18c7588 100644 --- a/graphics/potracegui/Makefile +++ b/graphics/potracegui/Makefile @@ -7,7 +7,7 @@ PORTNAME= potracegui PORTVERSION= 1.3.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics kde MASTER_SITES= SF diff --git a/graphics/povray31/Makefile b/graphics/povray31/Makefile index e5df5ca1a88e..f09b32c40e44 100644 --- a/graphics/povray31/Makefile +++ b/graphics/povray31/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.1g -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ @@ -19,7 +19,7 @@ DISTFILES= povuni_s.tgz povuni_d.tgz MAINTAINER= bkoenig@alpha-tierchen.de COMMENT= Persistence of Vision Ray Tracer -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png OPTIONS= X11 "X Window support" On diff --git a/graphics/povray31/files/patch-ab b/graphics/povray31/files/patch-ab index 1acc44a9241f..39187f94ab5f 100644 --- a/graphics/povray31/files/patch-ab +++ b/graphics/povray31/files/patch-ab @@ -1,5 +1,5 @@ ---- source/unix/makefile.orig Mon Nov 22 09:12:37 1999 -+++ source/unix/makefile Sat Dec 2 03:42:45 2006 +--- source/unix/makefile.orig 1999-11-22 02:12:37.000000000 +0100 ++++ source/unix/makefile 2012-05-06 19:41:21.000000000 +0200 @@ -53,7 +53,7 @@ #CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) @@ -33,8 +33,9 @@ # Use -Llibdir -lXXX if you want to use shared libraries (if they are # available). It doesn't matter if you only have libXXX.a libraries. -PNGDIR = $(SRCDIR)/libpng +-LIBPNGINC = -I$(PNGDIR) +PNGDIR = $(PREFIX)/include - LIBPNGINC = -I$(PNGDIR) ++LIBPNGINC = -I$(PNGDIR) -I${LOCALBASE}/include/libpng15 #LIBPNGLIB = $(PNGDIR)/libpng.a -LIBPNGLIB = -L$(PNGDIR) -lpng +LIBPNGLIB = -L$(PREFIX)/lib -lpng diff --git a/graphics/povray31/files/patch-png_pov.c b/graphics/povray31/files/patch-png_pov.c index 0bc4b332b20a..c830f27e02c4 100644 --- a/graphics/povray31/files/patch-png_pov.c +++ b/graphics/povray31/files/patch-png_pov.c @@ -1,6 +1,104 @@ --- source/png_pov.c.orig 1999-05-01 15:01:24.000000000 +0200 -+++ source/png_pov.c 2010-03-29 11:17:58.000000000 +0200 -@@ -1445,7 +1445,7 @@ ++++ source/png_pov.c 2012-05-05 07:28:33.000000000 +0200 +@@ -53,6 +53,7 @@ + #include "optout.h" + #include "png.h" + #include "png_pov.h" ++#include "pngpriv.h" + + + +@@ -227,7 +228,7 @@ + if (png_get_error_ptr(png_ptr)) + Error_Line("libpng: %s\n",msg); + +- longjmp(png_ptr->jmpbuf,1); ++ longjmp(png_jmpbuf(png_ptr),1); + } + + +@@ -356,7 +357,7 @@ + Error("Error allocating PNG data structures"); + } + +- if (setjmp(o_png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(o_png_ptr))) + { + /* If we get here, we had a problem reading the file */ + Status_Info("\n"); +@@ -397,7 +398,7 @@ + Error("Error allocating PNG data structures"); + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem writing the file */ + Status_Info("\n"); +@@ -509,7 +510,7 @@ + Error("Error allocating PNG data structures"); + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem writing the file */ + if (handle->buffer != NULL) +@@ -628,7 +629,7 @@ + case APPEND_MODE: + + #if defined(PNG_WRITE_FLUSH_SUPPORTED) +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem writing the file */ + +@@ -943,7 +944,7 @@ + } + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem writing the file */ + fclose(handle->file); +@@ -996,7 +997,7 @@ + { + register int col, j, step; + +- if (setjmp(o_png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(o_png_ptr))) + { + /* If we get here, we had a problem reading the file, which probably + * means that we have read all the available data, rather than a real +@@ -1006,7 +1007,7 @@ + return(0); + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem writing the new file */ + Status_Info("\n"); +@@ -1139,7 +1140,7 @@ + { + if (png_ptr != NULL) + { +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem writing the file */ + +@@ -1391,7 +1392,7 @@ + return; /* -hdf99- */ + } + +- if (setjmp(r_png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(r_png_ptr))) + { + /* If we get here, we had a problem reading the file */ + +@@ -1445,7 +1446,7 @@ if (r_info_ptr->valid & PNG_INFO_tRNS) { for (index = 0; index < r_info_ptr->num_trans; index++) @@ -9,7 +107,7 @@ } Image->data.map_lines = (unsigned char **) -@@ -1479,7 +1479,7 @@ +@@ -1479,7 +1480,7 @@ if (r_info_ptr->valid & PNG_INFO_tRNS) { for (index = 0; index < r_info_ptr->num_trans; index++) diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile index 2fab13fe4fab..5d7c66378e30 100644 --- a/graphics/povray36/Makefile +++ b/graphics/povray36/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.6.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ @@ -21,7 +21,7 @@ COMMENT= Persistence of Vision Ray Tracer .if defined(WITH_ICC) BUILD_DEPENDS= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc .endif -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg @@ -54,6 +54,8 @@ CFLAGS= -O3 -tpp7 -axN -Vaxlib CXXFLAGS= -O3 -tpp7 -axN -Vaxlib .endif +CFLAGS+= -I${LOCALBASE}/include/libpng15 +CXXFLAGS+= -I${LOCALBASE}/include/libpng15 CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \ CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \ CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \ diff --git a/graphics/povray36/files/patch-png_pov.cpp b/graphics/povray36/files/patch-png_pov.cpp index 01225b66021e..de3b006562ba 100644 --- a/graphics/povray36/files/patch-png_pov.cpp +++ b/graphics/povray36/files/patch-png_pov.cpp @@ -1,6 +1,104 @@ --- source/png_pov.cpp.orig 2004-08-03 01:11:37.000000000 +0200 -+++ source/png_pov.cpp 2010-03-29 14:06:26.000000000 +0200 -@@ -1428,7 +1428,7 @@ ++++ source/png_pov.cpp 2012-05-05 07:35:49.000000000 +0200 +@@ -53,6 +53,7 @@ + #include "pov_util.h" + #include "povmsend.h" + #include "colour.h" ++#include "pngpriv.h" + + USING_POV_NAMESPACE + +@@ -167,7 +168,7 @@ + if (png_get_error_ptr(png_ptr)) + PossibleError("libpng: %s",msg); + +- longjmp(png_ptr->jmpbuf,1); ++ longjmp(png_jmpbuf(png_ptr),1); + } + + +@@ -387,7 +388,7 @@ + Error("Cannot allocate PNG data structures"); + } + +- if (setjmp(o_png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(o_png_ptr))) + { + // If we get here, we had a problem reading the file + png_destroy_read_struct(&o_png_ptr, &info_ptr, (png_infopp)NULL); +@@ -433,7 +434,7 @@ + Error("Cannot allocate PNG data structures"); + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the file + png_destroy_read_struct(&o_png_ptr, &info_ptr, (png_infopp)NULL); +@@ -529,7 +530,7 @@ + Error("Cannot allocate PNG data structures"); + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the file + png_destroy_write_struct(&png_ptr, &info_ptr); +@@ -647,7 +648,7 @@ + case APPEND_MODE: + + #if defined(PNG_WRITE_FLUSH_SUPPORTED) +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the file + +@@ -756,7 +757,7 @@ + + if (png_ptr != NULL) + { +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the file + +@@ -1204,7 +1205,7 @@ + } + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the file + delete out_file; +@@ -1252,7 +1253,7 @@ + + register int col, j, step; + +- if (setjmp(o_png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(o_png_ptr))) + { + /* If we get here, we had a problem reading the file, which probably + * means that we have read all the available data, rather than a real +@@ -1261,7 +1262,7 @@ + return 0; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + // If we get here, we had a problem writing the new file + delete in_file; +@@ -1377,7 +1378,7 @@ + ((r_info_ptr = png_create_info_struct(r_png_ptr)) == NULL)) + Error("Cannot allocate PNG data structures"); + +- if(setjmp(r_png_ptr->jmpbuf)) ++ if(setjmp(png_jmpbuf(r_png_ptr))) + { + // If we get here, we had a problem reading the file + png_destroy_read_struct(&r_png_ptr, &r_info_ptr, (png_infopp)NULL); +@@ -1428,7 +1429,7 @@ if(r_info_ptr->valid & PNG_INFO_tRNS) { for (index = 0; index < r_info_ptr->num_trans; index++) @@ -9,7 +107,7 @@ } Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image"); -@@ -1461,7 +1461,7 @@ +@@ -1461,7 +1462,7 @@ if(r_info_ptr->valid & PNG_INFO_tRNS) { for (index = 0; index < r_info_ptr->num_trans; index++) diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index 585be201723b..789734a846ad 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray DISTVERSION= 3.7.0.RC3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.povray.org/beta/source/ DIST_SUBDIR= ${UNIQUENAME} @@ -69,7 +69,7 @@ CONFIGURE_ARGS+=--disable-io-restrictions .if defined(WITH_STATIC) BUILD_DEPENDS+= png>=1.4:${PORTSDIR}/graphics/png .else -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png LIBS+= -lpng .endif .else diff --git a/graphics/ppminfo/Makefile b/graphics/ppminfo/Makefile index b87a9f5ae90e..2a6dc017e5d5 100644 --- a/graphics/ppminfo/Makefile +++ b/graphics/ppminfo/Makefile @@ -7,7 +7,7 @@ PORTNAME= ppminfo PORTVERSION= 0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.vanheusden.com/ppminfo/ CENKES EXTRACT_SUFX= .tgz diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile index d574ed59797f..51152339ff85 100644 --- a/graphics/pqiv/Makefile +++ b/graphics/pqiv/Makefile @@ -7,6 +7,7 @@ PORTNAME= pqiv PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.pberndt.com/raw/Programme/Linux/pqiv/_download/ EXTRACT_SUFX= .tbz diff --git a/graphics/prison/Makefile b/graphics/prison/Makefile index 4c483fb58d7b..deb1ad52820f 100644 --- a/graphics/prison/Makefile +++ b/graphics/prison/Makefile @@ -6,6 +6,7 @@ PORTNAME= prison PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index fadda619914c..7e8092e24402 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -7,6 +7,7 @@ PORTNAME= pstoedit PORTVERSION= 3.60 +PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= SF diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile index a3f281537128..0ced4e9057b9 100644 --- a/graphics/pstoepsi/Makefile +++ b/graphics/pstoepsi/Makefile @@ -7,7 +7,7 @@ PORTNAME= pstoepsi PORTVERSION= 20020711 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://bourbon.usc.edu/pub/tgif/tools/pstoepsi/ DISTFILES= pstoepsi README.this-site diff --git a/graphics/pvmpov/Makefile b/graphics/pvmpov/Makefile index bfbd39d0f0ad..d974cab5269e 100644 --- a/graphics/pvmpov/Makefile +++ b/graphics/pvmpov/Makefile @@ -7,7 +7,7 @@ PORTNAME= pvmpov PORTVERSION= 3.1g.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics parallel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-3.1g2.tgz DISTNAME= ${PORTNAME}-3.1g2 @@ -18,6 +18,7 @@ COMMENT= Distributed rendering package for Persistence of Vision Ray Tracer BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/povray31:configure \ aimk:${PORTSDIR}/net/pvm +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png RUN_DEPENDS= povray31:${PORTSDIR}/graphics/povray31 \ pvmd:${PORTSDIR}/net/pvm diff --git a/graphics/pvmpov/files/patch-ab b/graphics/pvmpov/files/patch-ab index bc9572eda285..74c3af68658a 100644 --- a/graphics/pvmpov/files/patch-ab +++ b/graphics/pvmpov/files/patch-ab @@ -7,7 +7,7 @@ -PNGDIR = $(SRCDIR)/libpng -LIBPNGINC = -I$(PNGDIR) +PNGDIR = -+LIBPNGINC = -I%LOCALBASE%/include ++LIBPNGINC = -I%LOCALBASE%/include/libpng15 #LIBPNGLIB = $(PNGDIR)/libpng.a #LIBPNGINC = -I/usr/X11R6/include -LIBPNGLIB = -L$(PNGDIR) -lpng diff --git a/graphics/py-PyX/Makefile b/graphics/py-PyX/Makefile index 1172ab730cce..ec6422480795 100644 --- a/graphics/py-PyX/Makefile +++ b/graphics/py-PyX/Makefile @@ -8,6 +8,7 @@ PORTNAME= PyX PORTVERSION= 0.11.1 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= SF PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-amanith/Makefile b/graphics/py-amanith/Makefile index 2f7dbf1fa4e7..9411090506d5 100644 --- a/graphics/py-amanith/Makefile +++ b/graphics/py-amanith/Makefile @@ -7,7 +7,7 @@ PORTNAME= amanith PORTVERSION= 0.3.35 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics python MASTER_SITES= http://muksuluuri.ath.cx/~skyostil/projects/pyamanith/dist/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 95ea87c16036..0ee609cd7323 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -8,6 +8,7 @@ PORTNAME= cairo PORTVERSION= 1.8.10 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= http://cairographics.org/releases/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-chart/Makefile b/graphics/py-chart/Makefile index 24b4875ab5d4..7b3384ffc0d0 100644 --- a/graphics/py-chart/Makefile +++ b/graphics/py-chart/Makefile @@ -8,7 +8,7 @@ PORTNAME= chart PORTVERSION= 1.39 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics python MASTER_SITES= http://download.gna.org/pychart/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-clutter-gtk/Makefile b/graphics/py-clutter-gtk/Makefile index a5c215ea772b..1f071ea7172f 100644 --- a/graphics/py-clutter-gtk/Makefile +++ b/graphics/py-clutter-gtk/Makefile @@ -8,6 +8,7 @@ PORTNAME= clutter PORTVERSION= 0.10.0 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= http://www.clutter-project.org/sources/pyclutter-gtk/${PORTVERSION:R}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile index 99fdd874aa9b..f0bd606b8eee 100644 --- a/graphics/py-clutter/Makefile +++ b/graphics/py-clutter/Makefile @@ -8,7 +8,7 @@ PORTNAME= clutter PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics python MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/${PORTVERSION:R}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index b9db35e79bed..a2fc58d5cb4f 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -6,7 +6,7 @@ PORTNAME= gd PORTVERSION= 0.56 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics python MASTER_SITES= http://newcenturycomputers.net/projects/download.cgi/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile index a1758fd1eef3..8c42c82c43db 100644 --- a/graphics/py-gimp/Makefile +++ b/graphics/py-gimp/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # $MCom: ports/graphics/py-gimp/Makefile,v 1.6 2009/08/25 00:06:39 marcus Exp $ -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 0 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile index 0068bdf2c777..6c35468be66e 100644 --- a/graphics/py-goocanvas/Makefile +++ b/graphics/py-goocanvas/Makefile @@ -7,7 +7,7 @@ PORTNAME= goocanvas PORTVERSION= 0.14.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/py${PORTNAME}/${PORTVERSION:C/..$//} diff --git a/graphics/py-graph-dot/Makefile b/graphics/py-graph-dot/Makefile index 7727e6171feb..73bd36930712 100644 --- a/graphics/py-graph-dot/Makefile +++ b/graphics/py-graph-dot/Makefile @@ -7,6 +7,7 @@ PORTNAME= graph-dot PORTVERSION= 1.7.0 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile index b8dd179b9439..c27ec9b179db 100644 --- a/graphics/py-graphviz/Makefile +++ b/graphics/py-graphviz/Makefile @@ -6,6 +6,7 @@ PORTNAME= graphviz PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP \ http://networkx.lanl.gov/download/pygraphviz/ diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile index e529ea326c98..bc9f2fce3ddf 100644 --- a/graphics/py-ming/Makefile +++ b/graphics/py-ming/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ming -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile index c36fd3d8fb5a..4d9110826828 100644 --- a/graphics/py-paint/Makefile +++ b/graphics/py-paint/Makefile @@ -7,7 +7,7 @@ PORTNAME= paint PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}%20${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,14 +16,15 @@ DISTNAME= pypaint-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Simple and flexible painting adaptor to libart for Python -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_PYTHON= yes USE_PYDISTUTILS= yes USE_FREETYPE= yes USE_GNOME= libartlgpl2 NO_WRKSUBDIR= yes -CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype1 +CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 \ + -I${LOCALBASE}/include/freetype1 LDFLAGS+= -L${LOCALBASE}/lib EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} diff --git a/graphics/py-paint/files/patch-image.c b/graphics/py-paint/files/patch-image.c new file mode 100644 index 000000000000..4b3f9065e4c0 --- /dev/null +++ b/graphics/py-paint/files/patch-image.c @@ -0,0 +1,20 @@ +--- image.c.orig 2004-02-16 10:57:56.000000000 +0100 ++++ image.c 2012-05-05 07:40:54.000000000 +0200 +@@ -129,7 +129,7 @@ + set_error(PyExc_RuntimeError, "could not create info struct"); + return NULL; + } +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + fclose(fp); + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + set_error(PyExc_RuntimeError, "error building image"); +@@ -233,7 +233,7 @@ + set_error(PyExc_RuntimeError, "could not create info struct"); + goto error; + } +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + set_error(PyExc_RuntimeError, "error building image"); + goto error; + } diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile index 8993479cd6fe..ffd620595cac 100644 --- a/graphics/py-poppler/Makefile +++ b/graphics/py-poppler/Makefile @@ -7,7 +7,7 @@ PORTNAME= poppler PORTVERSION= 0.10.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics python MASTER_SITES= https://launchpad.net/poppler-python/trunk/development/+download/ \ http://launchpadlibrarian.net/30270080/ \ diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile index c3a82e7d20bb..5a004f060c03 100644 --- a/graphics/py-pycha/Makefile +++ b/graphics/py-pycha/Makefile @@ -7,6 +7,7 @@ PORTNAME= pycha PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-pydot/Makefile b/graphics/py-pydot/Makefile index be9dda0d81f8..0346f4693b7b 100644 --- a/graphics/py-pydot/Makefile +++ b/graphics/py-pydot/Makefile @@ -7,7 +7,7 @@ PORTNAME= pydot PORTVERSION= 1.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile index 0026fb0caa67..7d474dece6f1 100644 --- a/graphics/py-qt4-svg/Makefile +++ b/graphics/py-qt4-svg/Makefile @@ -6,6 +6,7 @@ PORTNAME= svg PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics devel python MASTER_SITES= ${MASTER_SITES_PYQT4} diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile index 23af99d7e2ad..1172bc6e84c7 100644 --- a/graphics/py-visual/Makefile +++ b/graphics/py-visual/Makefile @@ -7,7 +7,7 @@ PORTNAME= visual PORTVERSION= 4.b26 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics python MASTER_SITES= SF/${PORTNAME}python/${PORTNAME}-module/VPython%204.beta26 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/q-graph/Makefile b/graphics/q-graph/Makefile index 95a82c72f3f3..b3332bc6404e 100644 --- a/graphics/q-graph/Makefile +++ b/graphics/q-graph/Makefile @@ -7,7 +7,7 @@ PORTNAME= graph PORTVERSION= 1.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/q-lang/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= q- diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile index 16db714ba1b4..0bfa80ab4e8f 100644 --- a/graphics/qcomicbook/Makefile +++ b/graphics/qcomicbook/Makefile @@ -7,7 +7,7 @@ PORTNAME= qcomicbook PORTVERSION= 0.8.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://qcomicbook.linux-projects.net/releases/ diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 675eb279d911..4f1043aef45d 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -7,7 +7,7 @@ PORTNAME= qgis PORTVERSION= 1.7.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics geography MASTER_SITES= http://qgis.org/downloads/ \ http://download.osgeo.org/qgis/src/ diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile index 6969a0eda8aa..b28ccc494678 100644 --- a/graphics/qiv/Makefile +++ b/graphics/qiv/Makefile @@ -8,6 +8,7 @@ PORTNAME= qiv PORTVERSION= 2.2.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://spiegl.de/qiv/download/ \ http://www.predatorlabs.net/dl/ diff --git a/graphics/qiviewer/Makefile b/graphics/qiviewer/Makefile index c8409ede74b6..886312ccd4ce 100644 --- a/graphics/qiviewer/Makefile +++ b/graphics/qiviewer/Makefile @@ -7,6 +7,7 @@ PORTNAME= qiviewer PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile index 80425033f1f8..84a81b5cfc63 100644 --- a/graphics/qslim/Makefile +++ b/graphics/qslim/Makefile @@ -8,7 +8,7 @@ PORTNAME= qslim PORTVERSION= 2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://mgarland.org/files/dist/ \ CENKES @@ -18,7 +18,7 @@ COMMENT= SlimKit Surface Modeling Tools LICENSE= GPLv2 -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ gfx.0:${PORTSDIR}/graphics/libgfx \ forms.2:${PORTSDIR}/x11-toolkits/xforms diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile index a672a857a744..2f4ae9d4b69b 100644 --- a/graphics/qt4-iconengines/Makefile +++ b/graphics/qt4-iconengines/Makefile @@ -8,6 +8,7 @@ PORTNAME= iconengines DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES?= graphics PKGNAMEPREFIX= qt4- diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile index 4a68fd945a07..4cf5f7d808e9 100644 --- a/graphics/qt4-imageformats/Makefile +++ b/graphics/qt4-imageformats/Makefile @@ -8,6 +8,7 @@ PORTNAME= imageformats DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES?= graphics PKGNAMEPREFIX= qt4- @@ -16,7 +17,7 @@ COMMENT= Qt imageformat plugins for GIF, JPEG, MNG and SVG LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ mng:${PORTSDIR}/graphics/libmng \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff USE_QT_VER= 4 diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile index 76818fe56b22..b42356577d5d 100644 --- a/graphics/qt4-pixeltool/Makefile +++ b/graphics/qt4-pixeltool/Makefile @@ -8,6 +8,7 @@ PORTNAME= pixeltool DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES?= graphics PKGNAMEPREFIX= qt4- diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile index af73d7b8b3fe..43402033d8eb 100644 --- a/graphics/qt4-svg/Makefile +++ b/graphics/qt4-svg/Makefile @@ -8,6 +8,7 @@ PORTNAME= svg DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES?= graphics PKGNAMEPREFIX= qt4- diff --git a/graphics/qtgtl/Makefile b/graphics/qtgtl/Makefile index e609d24a2676..ae963962a36b 100644 --- a/graphics/qtgtl/Makefile +++ b/graphics/qtgtl/Makefile @@ -6,6 +6,7 @@ PORTNAME= qtgtl PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= http://download.opengtl.org/ DISTNAME= libQtGTL-${PORTVERSION} diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile index 73737b173683..dc15974e2efd 100644 --- a/graphics/quat-gui/Makefile +++ b/graphics/quat-gui/Makefile @@ -7,7 +7,7 @@ PORTNAME= quat PORTVERSION= 1.20 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://www.physcip.uni-stuttgart.de/phy11733/download/ PKGNAMESUFFIX= -gui diff --git a/graphics/radius-engine/Makefile b/graphics/radius-engine/Makefile index 2163fc6fae1c..a4e4e412daf1 100644 --- a/graphics/radius-engine/Makefile +++ b/graphics/radius-engine/Makefile @@ -16,7 +16,7 @@ COMMENT= Lua script-based 2D engine built on top of OpenGL and SDL LICENSE= MIT LIB_DEPENDS= lua-5.1:${PORTSDIR}/lang/lua \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ physfs.1:${PORTSDIR}/devel/physfs GNU_CONFIGURE= yes diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile index 292ee4e82d0c..f0fcc3ec5402 100644 --- a/graphics/raster3d/Makefile +++ b/graphics/raster3d/Makefile @@ -7,6 +7,7 @@ PORTNAME= raster3d PORTVERSION= 3.0.2 +PORTREVISION= 1 CATEGORIES= graphics biology MASTER_SITES= http://skuld.bmsc.washington.edu/${PORTNAME}/ DISTNAME= Raster3D_${PORTVERSION:R}-${PORTVERSION:E} diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile index 4bceac6585a4..6fa2a0b2520c 100644 --- a/graphics/rawstudio/Makefile +++ b/graphics/rawstudio/Makefile @@ -7,7 +7,7 @@ PORTNAME= rawstudio PORTVERSION= 2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://rawstudio.org/files/release/ @@ -17,6 +17,7 @@ COMMENT= Open-source program to read and manipulate RAW photo images LICENSE= GPLv2 LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ + png15:${PORTSDIR}/graphics/png \ lcms.1:${PORTSDIR}/graphics/lcms \ exiv2.10:${PORTSDIR}/graphics/exiv2 \ dbus-1.3:${PORTSDIR}/devel/dbus \ diff --git a/graphics/rawstudio/files/patch-exiv2-colorspace.cpp b/graphics/rawstudio/files/patch-exiv2-colorspace.cpp new file mode 100644 index 000000000000..ff3002ace1e1 --- /dev/null +++ b/graphics/rawstudio/files/patch-exiv2-colorspace.cpp @@ -0,0 +1,19 @@ +--- plugins/load-gdk/exiv2-colorspace.cpp.orig 2011-02-23 23:35:18.000000000 +0100 ++++ plugins/load-gdk/exiv2-colorspace.cpp 2012-05-12 12:15:07.000000000 +0200 +@@ -26,6 +26,7 @@ + #include "exiv2-colorspace.h" + #include <math.h> + #include <png.h> ++#include <pngpriv.h> + #include <jpeglib.h> + + #ifndef EXIV2_TEST_VERSION +@@ -129,7 +130,7 @@ + { + png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr, + (png_charpp) &icc_profile_title, &compression_type, +- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); ++ (png_byte**) (&icc_profile), (png_uint_32*) &icc_profile_size); + if (retval != 0) + { + RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE); diff --git a/graphics/rawstudio/files/patch-output-pngfile.c b/graphics/rawstudio/files/patch-output-pngfile.c new file mode 100644 index 000000000000..267a284c53e9 --- /dev/null +++ b/graphics/rawstudio/files/patch-output-pngfile.c @@ -0,0 +1,10 @@ +--- plugins/output-pngfile/output-pngfile.c.orig 2011-03-26 02:52:29.000000000 +0100 ++++ plugins/output-pngfile/output-pngfile.c 2012-05-12 14:23:21.000000000 +0200 +@@ -23,6 +23,7 @@ + #include <gettext.h> + #include "config.h" + #include <png.h> ++#include <zlib.h> + + #define RS_TYPE_PNGFILE (rs_pngfile_type) + #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile)) diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 165525828a74..800d65cd95b3 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -7,6 +7,7 @@ PORTNAME= rawtherapee PORTVERSION= 4.0.8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE @@ -19,7 +20,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ iptcdata.3:${PORTSDIR}/graphics/libiptcdata \ jpeg.11:${PORTSDIR}/graphics/jpeg \ lcms2.2:${PORTSDIR}/graphics/lcms2 \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ sigc-2.0:${PORTSDIR}/devel/libsigc++20 diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile index 817ede2bcb39..72d8ae78d4ea 100644 --- a/graphics/rayshade/Makefile +++ b/graphics/rayshade/Makefile @@ -7,7 +7,7 @@ PORTNAME= rayshade PORTVERSION= 4.0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://ccl.net/cca/software/SOURCES/C/rayshade/ \ http://www.mirrorservice.org/sites/graphics.stanford.edu/pub/rayshade/ \ diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile index 9e8e86176107..978345a3b3ef 100644 --- a/graphics/reallyslick/Makefile +++ b/graphics/reallyslick/Makefile @@ -7,7 +7,7 @@ PORTNAME= reallyslick PORTVERSION= 0.9.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/rss-glx/rss-glx/${PORTVERSION} DISTNAME= rss-glx_${PORTVERSION} diff --git a/graphics/repng2jpeg/Makefile b/graphics/repng2jpeg/Makefile index e6b8922179d0..ff35542eaf52 100644 --- a/graphics/repng2jpeg/Makefile +++ b/graphics/repng2jpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= repng2jpeg PORTVERSION= 1.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://sugachan.dip.jp/obsolete/arch/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/graphics/rgbpaint/Makefile b/graphics/rgbpaint/Makefile index 177b47655d74..0b5cdba439ec 100644 --- a/graphics/rgbpaint/Makefile +++ b/graphics/rgbpaint/Makefile @@ -7,7 +7,7 @@ PORTNAME= rgbpaint PORTVERSION= 0.8.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/mtpaint/${PORTNAME}/${PORTVERSION} diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile index 226b53b03c97..4462b2818e37 100644 --- a/graphics/ristretto/Makefile +++ b/graphics/ristretto/Makefile @@ -7,6 +7,7 @@ PORTNAME= ristretto PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= graphics xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} diff --git a/graphics/ruby-cairo/Makefile b/graphics/ruby-cairo/Makefile index f85b4dfc1001..6a06efc2bf37 100644 --- a/graphics/ruby-cairo/Makefile +++ b/graphics/ruby-cairo/Makefile @@ -8,6 +8,7 @@ PORTNAME= cairo PORTVERSION= 1.10.2 +PORTREVISION= 1 CATEGORIES= graphics ruby MASTER_SITES= http://cairographics.org/releases/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile index 5a252e48addb..03135d76b3ed 100644 --- a/graphics/ruby-gd/Makefile +++ b/graphics/ruby-gd/Makefile @@ -7,6 +7,7 @@ PORTNAME= gd PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= graphics ruby MASTER_SITES= http://www.daifukuya.com/archive/kagemai/lib/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile index fc48cc97c941..a378d645b611 100644 --- a/graphics/ruby-gdk_pixbuf2/Makefile +++ b/graphics/ruby-gdk_pixbuf2/Makefile @@ -8,6 +8,7 @@ PORTNAME= gdk_pixbuf2 PORTVERSION= ${RUBY_GNOME_PORTVERSION} +PORTREVISION= 1 CATEGORIES= graphics ruby gnome MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile index f52cea60803d..2c81e5550f06 100644 --- a/graphics/ruby-imlib2/Makefile +++ b/graphics/ruby-imlib2/Makefile @@ -7,7 +7,7 @@ PORTNAME= imlib2 PORTVERSION= 0.5.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics ruby MASTER_SITES= http://www.pablotron.org/download/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/graphics/ruby-ming/Makefile b/graphics/ruby-ming/Makefile index 955a10c2e8c7..f2192601345b 100644 --- a/graphics/ruby-ming/Makefile +++ b/graphics/ruby-ming/Makefile @@ -6,7 +6,7 @@ PORTNAME= ming PORTVERSION= 0.4.3.${RUBY_MING_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= graphics ruby MASTER_SITES= RF MASTER_SITE_SUBDIR= mingruby diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile index 14e067f25424..71e3288b4569 100644 --- a/graphics/ruby-rmagick/Makefile +++ b/graphics/ruby-rmagick/Makefile @@ -7,7 +7,7 @@ PORTNAME= rmagick PORTVERSION= 2.13.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics ruby MASTER_SITES= RF PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile index a62c053ee3b9..007e46828e48 100644 --- a/graphics/ruby-rsvg2/Makefile +++ b/graphics/ruby-rsvg2/Makefile @@ -8,6 +8,7 @@ PORTNAME= rsvg2 PORTVERSION= ${RUBY_GNOME_PORTVERSION} +PORTREVISION= 1 CATEGORIES= graphics ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile index 0496bfc209b1..b714ee1d93a2 100644 --- a/graphics/ruby-tgif/Makefile +++ b/graphics/ruby-tgif/Makefile @@ -7,7 +7,7 @@ PORTNAME= tgif PORTVERSION= 20010408 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics ruby MASTER_SITES= http://www2s.biglobe.ne.jp/~Nori/ruby/dist/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/graphics/rubygem-chunky_png/Makefile b/graphics/rubygem-chunky_png/Makefile index ae2efbc7d65a..454068f99ab4 100644 --- a/graphics/rubygem-chunky_png/Makefile +++ b/graphics/rubygem-chunky_png/Makefile @@ -7,6 +7,7 @@ PORTNAME= chunky_png PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= graphics rubygems MASTER_SITES= RG diff --git a/graphics/rubygem-png/Makefile b/graphics/rubygem-png/Makefile index 0e32ff5adec6..a47b4837bac8 100644 --- a/graphics/rubygem-png/Makefile +++ b/graphics/rubygem-png/Makefile @@ -7,6 +7,7 @@ PORTNAME= png PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= graphics rubygems MASTER_SITES= RG diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile index 5dc8fe0c6bd0..0654c04ecde2 100644 --- a/graphics/sam2p/Makefile +++ b/graphics/sam2p/Makefile @@ -8,6 +8,7 @@ PORTNAME= sam2p PORTVERSION= 0.49 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE diff --git a/graphics/sane-epkowa/Makefile b/graphics/sane-epkowa/Makefile index d0366d750ba4..9644d24f5088 100644 --- a/graphics/sane-epkowa/Makefile +++ b/graphics/sane-epkowa/Makefile @@ -43,7 +43,7 @@ PORTNAME= epkowa PORTVERSION= 2.11.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://lx1.avasys.jp/iscan/${PORTVERSION}/ DISTNAME= iscan_${PORTVERSION}-1 diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile index 283e99dfacce..3a8b124a67e6 100644 --- a/graphics/sane-frontends/Makefile +++ b/graphics/sane-frontends/Makefile @@ -7,7 +7,7 @@ PORTNAME= sane-frontends PORTVERSION= 1.0.14 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://alioth.debian.org/frs/download.php/1140/ \ ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \ diff --git a/graphics/scale2x/Makefile b/graphics/scale2x/Makefile index c47d9cd92939..58e59e544f33 100644 --- a/graphics/scale2x/Makefile +++ b/graphics/scale2x/Makefile @@ -7,22 +7,22 @@ PORTNAME= scale2x PORTVERSION= 2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Real-time graphics effect able to increase the size of small bitmaps -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes MAN1= scalex.1 scalerx.1 PLIST_FILES= bin/scalex bin/scalerx -CPPFLAGS+= `libpng14-config --I_opts` -LDFLAGS+= `libpng14-config --L_opts` +CPPFLAGS+= `libpng15-config --I_opts` +LDFLAGS+= `libpng15-config --L_opts` post-patch: ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile index 420ac553d33b..8813609e4adf 100644 --- a/graphics/scantailor/Makefile +++ b/graphics/scantailor/Makefile @@ -7,6 +7,7 @@ PORTNAME= scantailor PORTVERSION= 0.9.10 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -18,7 +19,7 @@ LICENSE= GPLv3 LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ jbig.1:${PORTSDIR}/graphics/jbigkit \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs USE_CMAKE= yes diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile index 943a94603a22..32c88bdf8cdc 100644 --- a/graphics/scr2png/Makefile +++ b/graphics/scr2png/Makefile @@ -7,7 +7,7 @@ PORTNAME= scr2png PORTVERSION= 1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= nik diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile index b0bf7df74028..c4d687f14800 100644 --- a/graphics/scrot/Makefile +++ b/graphics/scrot/Makefile @@ -7,7 +7,7 @@ PORTNAME= scrot PORTVERSION= 0.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://linuxbrit.co.uk/downloads/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile index 2c8a7b54afee..9f7d68df864b 100644 --- a/graphics/sdl_image/Makefile +++ b/graphics/sdl_image/Makefile @@ -7,6 +7,7 @@ PORTNAME= sdl_image PORTVERSION= 1.2.12 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ DISTNAME= SDL_image-${PORTVERSION} @@ -15,7 +16,7 @@ MAINTAINER= mva@FreeBSD.org COMMENT= A simple library to load images of various formats as SDL surfaces LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff USE_AUTOTOOLS= libtool diff --git a/graphics/seam-carving-gui/Makefile b/graphics/seam-carving-gui/Makefile index 963b0452abfd..74bdbb477c95 100644 --- a/graphics/seam-carving-gui/Makefile +++ b/graphics/seam-carving-gui/Makefile @@ -7,7 +7,7 @@ PORTNAME= seam-carving-gui PORTVERSION= 1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= SeamCarvingGui-Src-${PORTVERSION} diff --git a/graphics/separate/Makefile b/graphics/separate/Makefile index 1f6d5e990a3e..c9014754b752 100644 --- a/graphics/separate/Makefile +++ b/graphics/separate/Makefile @@ -7,6 +7,7 @@ PORTNAME= separate PORTVERSION= 0.5.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SFJP diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile index 8808bfe20595..4f73120e78c1 100644 --- a/graphics/sharpconstruct/Makefile +++ b/graphics/sharpconstruct/Makefile @@ -7,7 +7,7 @@ PORTNAME= sharpconstruct PORTVERSION= 0.11 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/sharp3d/SharpConstruct/${PORTVERSION} diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index e4dd85d5158b..93d85d408e09 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -7,6 +7,7 @@ PORTNAME= shotwell PORTVERSION= 0.11.6 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= http://www.yorba.org/download/shotwell/${PORTVERSION:R}/ diff --git a/graphics/show/Makefile b/graphics/show/Makefile index 9a7a64eb58a8..053ba7072d03 100644 --- a/graphics/show/Makefile +++ b/graphics/show/Makefile @@ -7,7 +7,7 @@ PORTNAME= show PORTVERSION= 2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://www.ibiblio.org/propaganda/ \ http://www.freebsdbrasil.com.br/~jmelo/ @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A fast, flexible, extensible and bloat-free image viewer for X11 LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ gif.5:${PORTSDIR}/graphics/giflib \ Imlib.5:${PORTSDIR}/graphics/imlib diff --git a/graphics/showimage/Makefile b/graphics/showimage/Makefile index a7c33e4b6cbb..5fb4f9e9a188 100644 --- a/graphics/showimage/Makefile +++ b/graphics/showimage/Makefile @@ -7,7 +7,7 @@ PORTNAME= showimage PORTVERSION= 1.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/ DISTNAME= 143977-${PORTNAME}-${PORTVERSION} diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile index 519a6404b058..f606d021d17b 100644 --- a/graphics/showimg/Makefile +++ b/graphics/showimg/Makefile @@ -8,7 +8,7 @@ PORTNAME= showimg PORTVERSION= 0.9.5 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.jalix.org/projects/${PORTNAME}/download/${PORTVERSION}/ \ diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile index 8307ea4c11e5..6f3b1405bc30 100644 --- a/graphics/simage/Makefile +++ b/graphics/simage/Makefile @@ -7,6 +7,7 @@ PORTNAME= simage PORTVERSION= 1.7.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ @@ -18,7 +19,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ jasper.4:${PORTSDIR}/graphics/jasper \ jpeg.11:${PORTSDIR}/graphics/jpeg \ gif.5:${PORTSDIR}/graphics/giflib \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_GNOME= gnomehack USE_AUTOTOOLS= libtool diff --git a/graphics/simage/files/patch-simage_png.c b/graphics/simage/files/patch-simage_png.c new file mode 100644 index 000000000000..b0dc15caad22 --- /dev/null +++ b/graphics/simage/files/patch-simage_png.c @@ -0,0 +1,11 @@ +--- src/simage_png.c.orig 2010-02-26 16:47:31.000000000 +0100 ++++ src/simage_png.c 2012-05-05 07:44:14.000000000 +0200 +@@ -323,7 +323,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose(fp); + png_destroy_write_struct(&png_ptr, (png_infopp)info_ptr); diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile index fa97051b7410..9e02170f6af9 100644 --- a/graphics/simpleviewer/Makefile +++ b/graphics/simpleviewer/Makefile @@ -7,7 +7,7 @@ PORTNAME= simpleviewer PORTVERSION= 1.7.1553.8560 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/OpenGL%20edition DISTNAME= sviewgl-src-${PORTVERSION} @@ -18,13 +18,14 @@ COMMENT= Small and simple OpenGL image viewer with transparency support LICENSE= GPLv2 LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ gif.5:${PORTSDIR}/graphics/giflib USE_BZIP2= yes USE_EFL= imlib2 USE_GL= glut WRKSRC= ${WRKDIR}/sviewgl-src +CFLAGS+= -I${LOCALBASE}/include/libpng15 MAKE_ARGS= CC=${CXX} PLIST_FILES= bin/sviewgl @@ -32,7 +33,7 @@ PLIST_FILES= bin/sviewgl .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -e 's,-O2,${CFLAGS}, ; s,/usr,${LOCALBASE},g ; \ + @${REINPLACE_CMD} -e 's,-O2,${CFLAGS}, ; s,/usr/include,${LOCALBASE}/include,g ; \ s,=-s,=-L${LOCALBASE}/lib,' ${WRKSRC}/Makefile .if ${OSVERSION} < 800501 @${REINPLACE_CMD} -e 's,const struct dirent,struct dirent,' \ diff --git a/graphics/simpleviewer/files/patch-formatpng.cpp b/graphics/simpleviewer/files/patch-formatpng.cpp new file mode 100644 index 000000000000..b910eb4ffbf7 --- /dev/null +++ b/graphics/simpleviewer/files/patch-formatpng.cpp @@ -0,0 +1,10 @@ +--- src/formats/formatpng.cpp.orig 2010-08-29 16:33:33.000000000 +0200 ++++ src/formats/formatpng.cpp 2012-05-05 07:46:22.000000000 +0200 +@@ -7,6 +7,7 @@ + + #include "formatpng.h" + #include <png.h> ++#include <pngpriv.h> + #include <string.h> + #include <iostream> + diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile index bb2aa7de6bb6..1cb8838ef996 100644 --- a/graphics/skanlite/Makefile +++ b/graphics/skanlite/Makefile @@ -7,7 +7,7 @@ PORTNAME= skanlite PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= SF/sanewidget/Skanlite/ DIST_SUBDIR= KDE/extragear diff --git a/graphics/sng/Makefile b/graphics/sng/Makefile index 3b193d2cbc74..87fdc7cfdbf2 100644 --- a/graphics/sng/Makefile +++ b/graphics/sng/Makefile @@ -8,6 +8,7 @@ PORTNAME= sng PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ @@ -16,9 +17,10 @@ COMMENT= Compiler/decompiler for Scriptable Network Graphics BUILD_DEPENDS= ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb RUN_DEPENDS= ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes +CFLAGS+= -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-png-inc=${LOCALBASE}/include \ --with-rgbtxt=${LOCALBASE}/lib/X11/rgb.txt @@ -26,7 +28,7 @@ CONFIGURE_ARGS= --with-png-inc=${LOCALBASE}/include \ MAN1= sng.1 PLIST_FILES= bin/sng bin/sng_regress -pre-patch: +no-pre-patch: @${REINPLACE_CMD} -e 's|-static||g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e '33,34s|^static ||' ${WRKSRC}/sngd.c diff --git a/graphics/sng/files/patch-sngc.c b/graphics/sng/files/patch-sngc.c new file mode 100644 index 000000000000..14992c786307 --- /dev/null +++ b/graphics/sng/files/patch-sngc.c @@ -0,0 +1,10 @@ +--- sngc.c.orig 2010-11-05 18:29:14.000000000 +0100 ++++ sngc.c 2012-05-04 07:33:36.000000000 +0200 +@@ -11,6 +11,7 @@ + #include <ctype.h> + #define PNG_INTERNAL + #include "png.h" ++#include "pngpriv.h" + + #include "sng.h" + diff --git a/graphics/sng/files/patch-sngd.c b/graphics/sng/files/patch-sngd.c index d6259018e75d..559068050313 100644 --- a/graphics/sng/files/patch-sngd.c +++ b/graphics/sng/files/patch-sngd.c @@ -1,6 +1,25 @@ ---- sngd.c.orig 2003-11-15 20:25:10.000000000 +0100 -+++ sngd.c 2010-03-29 16:10:17.000000000 +0200 -@@ -793,17 +793,17 @@ +--- sngd.c.orig 2012-05-04 08:20:04.000000000 +0200 ++++ sngd.c 2012-05-04 08:42:54.000000000 +0200 +@@ -10,6 +10,7 @@ + #define PNG_INTERNAL + #include "config.h" /* for RGBTXT */ + #include "png.h" ++#include "pngpriv.h" + #include "sng.h" + + png_structp png_ptr; +@@ -726,8 +727,8 @@ + } + #ifdef PNG_FLOATING_POINT_SUPPORTED + #ifndef MNG_INTERFACE +- fprintf(fpout, " width: %g\n", info_ptr->scal_pixel_width); +- fprintf(fpout, " height: %g\n", info_ptr->scal_pixel_height); ++ fprintf(fpout, " width: %s\n", info_ptr->scal_s_width); ++ fprintf(fpout, " height: %s\n", info_ptr->scal_s_height); + #else + fprintf(fpout, " width: %g\n", info_ptr->scal.pixel_width); + fprintf(fpout, " height: %g\n", info_ptr->scal.pixel_height); +@@ -794,17 +795,17 @@ fprintf(fpout, "tRNS {\n"); switch (info_ptr->color_type) { case PNG_COLOR_TYPE_GRAY: diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile index 67564cff3f0d..9d6905bbe3be 100644 --- a/graphics/sodipodi/Makefile +++ b/graphics/sodipodi/Makefile @@ -7,14 +7,15 @@ PORTNAME= sodipodi PORTVERSION= 0.34 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= graphics gnome MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= A small vector based drawing program with GNOME libraries -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ + png15:${PORTSDIR}/graphics/png USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libglade2 libartlgpl2 desktopfileutils diff --git a/graphics/sodipodi/files/patch-src_helper_png-write.c b/graphics/sodipodi/files/patch-src_helper_png-write.c new file mode 100644 index 000000000000..35452d0e8a13 --- /dev/null +++ b/graphics/sodipodi/files/patch-src_helper_png-write.c @@ -0,0 +1,29 @@ +--- src/helper/png-write.c.orig 2004-02-09 20:01:16.000000000 +0100 ++++ src/helper/png-write.c 2012-05-09 12:54:09.000000000 +0200 +@@ -111,7 +111,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose(fp); + png_destroy_write_struct(&png_ptr, &info_ptr); +@@ -282,7 +282,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose (fp); + unlink (filename); +@@ -370,7 +370,7 @@ + + h = MIN (height - r, 64); + n = get_rows ((const unsigned char **) row_pointers, r, h, data); +- if (!n) longjmp (png_ptr->jmpbuf, 1); ++ if (!n) longjmp (png_jmpbuf(png_ptr), 1); + png_write_rows (png_ptr, row_pointers, n); + r += n; + } diff --git a/graphics/structuresynth/Makefile b/graphics/structuresynth/Makefile index 1b362169f35f..73edb2db5660 100644 --- a/graphics/structuresynth/Makefile +++ b/graphics/structuresynth/Makefile @@ -7,7 +7,7 @@ PORTNAME= structuresynth PORTVERSION= 1.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Structure%20Synth/Version%201.5%20%28Hinxton%29 DISTNAME= StructureSynth-Source-v${PORTVERSION} diff --git a/graphics/svg2pdf/Makefile b/graphics/svg2pdf/Makefile index ba311381c6bd..7d50f0a5cd89 100644 --- a/graphics/svg2pdf/Makefile +++ b/graphics/svg2pdf/Makefile @@ -8,7 +8,7 @@ PORTNAME= svg2pdf PORTVERSION= 0.1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ diff --git a/graphics/svg2png/Makefile b/graphics/svg2png/Makefile index 64627b8f5cc9..a7e95a63b18e 100644 --- a/graphics/svg2png/Makefile +++ b/graphics/svg2png/Makefile @@ -8,7 +8,7 @@ PORTNAME= svg2png PORTVERSION= 0.1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ diff --git a/graphics/svgviewer/Makefile b/graphics/svgviewer/Makefile index 6326e9bca2a1..59367f862d8f 100644 --- a/graphics/svgviewer/Makefile +++ b/graphics/svgviewer/Makefile @@ -7,7 +7,7 @@ PORTNAME= svgviewer PORTVERSION= 0.2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics gnustep MASTER_SITES= http://gnu.ethz.ch/debian/svgviewer/ DISTNAME= SVGViewer-${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= SVG Viewer for GNUstep LIB_DEPENDS+= svg.1:${PORTSDIR}/graphics/libsvg LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile index 24dc668cba27..754c82b8b081 100644 --- a/graphics/swfdec/Makefile +++ b/graphics/swfdec/Makefile @@ -8,7 +8,7 @@ PORTNAME= swfdec PORTVERSION= 0.8.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.8/ diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile index e1a0fd71ef2c..b7ba59941843 100644 --- a/graphics/swfmill/Makefile +++ b/graphics/swfmill/Makefile @@ -7,13 +7,14 @@ PORTNAME= swfmill PORTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://swfmill.org/releases/ MAINTAINER= skv@FreeBSD.org COMMENT= xml2swf and swf2xml processor with import functionalities -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 USE_AUTOTOOLS= libtool @@ -25,6 +26,6 @@ CONFIGURE_ENV+= PKG_CONFIG=${LOCALBASE}/bin/pkg-config USE_LDCONFIG= YES post-patch: - @${REINPLACE_CMD} -e 's|libpng|libpng14|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|libpng|libpng15|' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/graphics/swfmill/files/patch-readpng.c b/graphics/swfmill/files/patch-readpng.c index ba18494b46ea..53c3d44c9172 100644 --- a/graphics/swfmill/files/patch-readpng.c +++ b/graphics/swfmill/files/patch-readpng.c @@ -1,6 +1,14 @@ ---- src/swft/readpng.c.orig 2006-07-20 15:57:17.000000000 +0200 -+++ src/swft/readpng.c 2010-03-29 16:19:53.000000000 +0200 -@@ -69,7 +69,7 @@ +--- src/swft/readpng.c.orig 2009-11-30 01:18:53.000000000 +0100 ++++ src/swft/readpng.c 2012-05-05 07:48:08.000000000 +0200 +@@ -51,6 +51,7 @@ + #include <stdlib.h> + + #include "png.h" /* libpng header; includes zlib.h */ ++#include "zlib.h" + #include "readpng.h" /* typedefs, common macros, public prototypes */ + + /* future versions of libpng will provide this macro: */ +@@ -87,7 +88,7 @@ * have used slightly more general png_sig_cmp() function instead */ fread(sig, 1, 8, infile); diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile index 97b12405efca..75e1b5f71b61 100644 --- a/graphics/synfigstudio/Makefile +++ b/graphics/synfigstudio/Makefile @@ -7,6 +7,7 @@ PORTNAME= synfigstudio DISTVERSION= 0.63.05 +PORTREVISION= 1 CATEGORIES= graphics multimedia MASTER_SITES= SF/synfig/${PORTNAME}/${PORTVERSION} diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile index 840bb92eb985..246b533ea608 100644 --- a/graphics/telak/Makefile +++ b/graphics/telak/Makefile @@ -7,6 +7,7 @@ PORTNAME= telak PORTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://julien.danjou.info/telak/ \ CRITICAL diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile index a2b1dcfb3053..353110ea6499 100644 --- a/graphics/tesseract/Makefile +++ b/graphics/tesseract/Makefile @@ -7,7 +7,7 @@ PORTNAME= tesseract PORTVERSION= 3.01 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} .if !defined(NOPORTDATA) || make(makesum) diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile index 2bf788bdd406..46c9cde181e8 100644 --- a/graphics/tgif/Makefile +++ b/graphics/tgif/Makefile @@ -7,6 +7,7 @@ PORTNAME= tgif PORTVERSION= 4.2.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://bourbon.usc.edu/pub/tgif/ \ http://groups.yahoo.com/group/tgif4-announce/files/ \ diff --git a/graphics/tif22pnm/Makefile b/graphics/tif22pnm/Makefile index b724eac4dccc..ffdbb8153474 100644 --- a/graphics/tif22pnm/Makefile +++ b/graphics/tif22pnm/Makefile @@ -8,7 +8,7 @@ PORTNAME= tif22pnm PORTVERSION= 0.12 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://pts.szit.bme.hu/ \ GOOGLE_CODE @@ -16,7 +16,7 @@ MASTER_SITES= http://pts.szit.bme.hu/ \ MAINTAINER= martymac@FreeBSD.org COMMENT= Converts TIFF- sampled images to PNM image -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config @@ -36,8 +36,8 @@ do-build: cd ${WRKSRC} \ && ${CC} ${CFLAGS} -DNDEBUG -I${LOCALBASE}/include \ ${TIF22PNM_SRCS} -o tif22pnm -L${LOCALBASE}/lib -ltiff \ - && ${CC} ${CFLAGS} -DNDEBUG `pkg-config libpng14 --cflags` \ - ${PNG2PNM_SRCS} -o png22pnm `pkg-config libpng14 --libs` + && ${CC} ${CFLAGS} -DNDEBUG `pkg-config libpng15 --cflags` \ + ${PNG2PNM_SRCS} -o png22pnm `pkg-config libpng15 --libs` do-install: ${INSTALL_PROGRAM} ${WRKSRC}/png22pnm ${PREFIX}/bin diff --git a/graphics/tif22pnm/files/patch-png22pnm.c b/graphics/tif22pnm/files/patch-png22pnm.c index dc9378f22e29..45212e6231ec 100644 --- a/graphics/tif22pnm/files/patch-png22pnm.c +++ b/graphics/tif22pnm/files/patch-png22pnm.c @@ -1,6 +1,14 @@ --- png22pnm.c.orig 2003-03-18 17:14:51.000000000 +0100 -+++ png22pnm.c 2010-03-29 08:27:57.000000000 +0200 -@@ -783,7 +783,7 @@ ++++ png22pnm.c 2012-05-04 07:36:40.000000000 +0200 +@@ -40,6 +40,7 @@ + + #include <math.h> + #include <png.h> /* includes zlib.h and setjmp.h */ ++#include <pngpriv.h> + #if 0 + #define VERSION "p2.37.4 (5 December 1999) +netpbm" + #else +@@ -783,7 +784,7 @@ (info_ptr->valid & PNG_INFO_tRNS)) { trans_mix = TRUE; for (i = 0 ; i < info_ptr->num_trans ; i++) @@ -9,7 +17,7 @@ trans_mix = FALSE; break; } -@@ -932,7 +932,7 @@ +@@ -932,7 +933,7 @@ pnm_type = PBM_TYPE; if (info_ptr->valid & PNG_INFO_tRNS) { for (i = 0 ; i < info_ptr->num_trans ; i++) { @@ -18,7 +26,7 @@ pnm_type = PGM_TYPE; break; } -@@ -1009,7 +1009,7 @@ +@@ -1009,7 +1010,7 @@ case PNG_COLOR_TYPE_GRAY: store_pixel (pnm_pixel, c, c, c, ((info_ptr->valid & PNG_INFO_tRNS) && @@ -27,7 +35,7 @@ 0 : maxval); break; -@@ -1023,7 +1023,7 @@ +@@ -1023,7 +1024,7 @@ info_ptr->palette[c].green, info_ptr->palette[c].blue, (info_ptr->valid & PNG_INFO_tRNS) && c<info_ptr->num_trans ? @@ -36,7 +44,7 @@ break; case PNG_COLOR_TYPE_RGB: -@@ -1031,9 +1031,9 @@ +@@ -1031,9 +1032,9 @@ c3 = get_png_val (png_pixel); store_pixel (pnm_pixel, c, c2, c3, ((info_ptr->valid & PNG_INFO_tRNS) && diff --git a/graphics/tiff2png/Makefile b/graphics/tiff2png/Makefile index 56913aec679b..1a7d1099b4fc 100644 --- a/graphics/tiff2png/Makefile +++ b/graphics/tiff2png/Makefile @@ -7,7 +7,7 @@ PORTNAME= tiff2png PORTVERSION= 0.91 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SF/png-mng/${PORTNAME}/${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= Converts TIFF images to PNG format LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png MAKEFILE= Makefile.unx MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/graphics/tiff2png/files/patch-tiff2png.c b/graphics/tiff2png/files/patch-tiff2png.c new file mode 100644 index 000000000000..ba385e7a7f01 --- /dev/null +++ b/graphics/tiff2png/files/patch-tiff2png.c @@ -0,0 +1,10 @@ +--- tiff2png.c.orig 2002-09-13 01:00:00.000000000 +0200 ++++ tiff2png.c 2012-04-27 07:10:32.000000000 +0200 +@@ -87,6 +87,7 @@ + # include "tiffcomp.h" /* not installed by default */ + #endif + #include "png.h" ++#include "zlib.h" + + #ifdef _MSC_VER /* works for MSVC 5.0; need finer tuning? */ + # define strcasecmp _stricmp diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile index 838ae9e39f33..306c32e6df2d 100644 --- a/graphics/truevision/Makefile +++ b/graphics/truevision/Makefile @@ -8,7 +8,7 @@ PORTNAME= truevision PORTVERSION= 0.5.5.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/0.5.5 DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile index 6e9131a46a69..e83233fa75b3 100644 --- a/graphics/tulip/Makefile +++ b/graphics/tulip/Makefile @@ -8,7 +8,7 @@ PORTNAME= tulip PORTVERSION= 3.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} diff --git a/graphics/tumble/Makefile b/graphics/tumble/Makefile index 613e2505b6ae..d769f4667063 100644 --- a/graphics/tumble/Makefile +++ b/graphics/tumble/Makefile @@ -7,7 +7,7 @@ PORTNAME= tumble PORTVERSION= 0.33 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics print MASTER_SITES= http://tumble.brouhaha.com/download/ \ http://www.predatorlabs.net/dl/ diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index 440c2931e323..1a939436a726 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -7,7 +7,7 @@ PORTNAME= ufraw PORTVERSION= 0.18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -18,7 +18,7 @@ LICENSE= GPLv2 LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ lcms.1:${PORTSDIR}/graphics/lcms GNU_CONFIGURE= yes diff --git a/graphics/uniconvw/Makefile b/graphics/uniconvw/Makefile index 0227b45ed587..4bee8d7f294c 100644 --- a/graphics/uniconvw/Makefile +++ b/graphics/uniconvw/Makefile @@ -7,6 +7,7 @@ PORTNAME= uniconvw PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= GOOGLE_CODE \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile index a602fabaf6a4..2939588f6a89 100644 --- a/graphics/urt/Makefile +++ b/graphics/urt/Makefile @@ -7,7 +7,7 @@ PORTNAME= urt PORTVERSION= 3.1b1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= ftp://ftp.iastate.edu/pub/utah-raster/ DISTNAME= urt diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile index 822bf4c9e876..25b4f0b61777 100644 --- a/graphics/view3ds/Makefile +++ b/graphics/view3ds/Makefile @@ -7,7 +7,7 @@ PORTNAME= view3ds PORTVERSION= 1.0.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index 9aa8c3360d2f..7667d459e02f 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -11,7 +11,7 @@ PORTNAME= vigra PORTVERSION= 1.7.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -48,7 +48,7 @@ LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg .endif .if !defined(WITHOUT_VIGRA_PNG) -LIB_DEPENDS+= png:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .endif .if !defined(WITHOUT_VIGRA_FFTW) diff --git a/graphics/vigra/files/patch-png.cxx b/graphics/vigra/files/patch-png.cxx new file mode 100644 index 000000000000..d6fd4f212143 --- /dev/null +++ b/graphics/vigra/files/patch-png.cxx @@ -0,0 +1,20 @@ +--- src/impex/png.cxx.orig 2010-12-03 18:40:34.000000000 +0100 ++++ src/impex/png.cxx 2012-05-05 07:53:39.000000000 +0200 +@@ -320,7 +320,7 @@ + #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) + char * dummyName; + int dummyCompType; +- char * profilePtr; ++ png_byte * profilePtr; + png_uint_32 profileLen; + if (png_get_valid( png, info, PNG_INFO_iCCP )) { + png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; +@@ -592,7 +592,7 @@ + // set icc profile + if (iccProfile.size() > 0) { + png_set_iCCP(png, info, (png_charp)("icc"), 0, +- (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size()); ++ (const png_byte *)iccProfile.begin(), (png_uint_32)iccProfile.size()); + } + #endif + diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index 3e549c669a85..7b130b998bbf 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -7,7 +7,7 @@ PORTNAME= vips PORTVERSION= 7.26.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/ @@ -25,7 +25,7 @@ LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ GraphicsMagick:${PORTSDIR}/graphics/GraphicsMagick \ IlmImf:${PORTSDIR}/graphics/OpenEXR \ orc-0:${PORTSDIR}/devel/orc \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ matio:${PORTSDIR}/math/matio \ lcms:${PORTSDIR}/graphics/lcms diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile index b91dacfbe347..9460c1ce7a3b 100644 --- a/graphics/visionworkbench/Makefile +++ b/graphics/visionworkbench/Makefile @@ -7,7 +7,7 @@ PORTNAME= visionworkbench PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://ti.arc.nasa.gov/m/project/nasa-vision-workbench/ DISTNAME= VisionWorkbench-${PORTVERSION} @@ -31,7 +31,7 @@ USE_LDCONFIG= yes USE_PYTHON= 2.4+ LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png LIB_DEPENDS+= boost_thread.4:${PORTSDIR}/devel/boost-libs LIB_DEPENDS+= boost_python.4:${PORTSDIR}/devel/boost-python-libs LIB_DEPENDS+= gdal:${PORTSDIR}/graphics/gdal diff --git a/graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc b/graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc new file mode 100644 index 000000000000..962b7bdbb2a0 --- /dev/null +++ b/graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc @@ -0,0 +1,10 @@ +--- src/vw/FileIO/DiskImageResourcePNG.cc.orig 2011-05-13 01:00:56.000000000 +0200 ++++ src/vw/FileIO/DiskImageResourcePNG.cc 2012-05-05 08:28:48.000000000 +0200 +@@ -24,6 +24,7 @@ + #include <vw/Image/Manipulation.h> + + #include <png.h> ++#include <zlib.h> + #include <vector> + #include <fstream> + diff --git a/graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc b/graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc new file mode 100644 index 000000000000..786775f4ddeb --- /dev/null +++ b/graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc @@ -0,0 +1,11 @@ +--- src/vw/FileIO/MemoryImageResourcePNG.cc.orig 2011-05-13 01:00:56.000000000 +0200 ++++ src/vw/FileIO/MemoryImageResourcePNG.cc 2012-05-06 11:29:59.000000000 +0200 +@@ -11,6 +11,8 @@ + + namespace vw { + ++typedef void * voidp; ++ + class SrcMemoryImageResourcePNG::Data : public fileio::detail::PngIODecompress { + boost::shared_array<const uint8> m_data; + const uint8 * m_cur; diff --git a/graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc b/graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc new file mode 100644 index 000000000000..ebef892f48f0 --- /dev/null +++ b/graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc @@ -0,0 +1,10 @@ +--- src/vw/FileIO/PngIO.cc.orig 2011-05-13 01:00:56.000000000 +0200 ++++ src/vw/FileIO/PngIO.cc 2012-05-06 13:36:44.000000000 +0200 +@@ -9,6 +9,7 @@ + #include <vw/Core/Exception.h> + #include <vw/Core/Log.h> + #include <vw/Core/Settings.h> ++#include <zlib.h> + + static void png_error_handler(png_structp /*png_ptr*/, png_const_charp error_msg) + { diff --git a/graphics/visprint/Makefile b/graphics/visprint/Makefile index fc19aa983cd6..12b2782008a4 100644 --- a/graphics/visprint/Makefile +++ b/graphics/visprint/Makefile @@ -7,14 +7,14 @@ PORTNAME= visprint PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.tastyrabbit.net/visprint/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Creates fractal fingerprint images based on any data -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lpng diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile index 5393ba3fd0cb..6c73f8940f31 100644 --- a/graphics/vp/Makefile +++ b/graphics/vp/Makefile @@ -7,7 +7,7 @@ PORTNAME= vp PORTVERSION= 1.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://bzflag.bz/~erik/files/ diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile index 1761752dde92..4930d35955bd 100644 --- a/graphics/webp/Makefile +++ b/graphics/webp/Makefile @@ -7,6 +7,7 @@ PORTNAME= webp PORTVERSION= 0.1.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE DISTNAME= lib${PORTNAME}-${PORTVERSION} @@ -15,7 +16,7 @@ MAINTAINER= johans@FreeBSD.org COMMENT= Google WebP image format conversion tool LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile index 3efb7316caae..2d628f89a09a 100644 --- a/graphics/white_dune/Makefile +++ b/graphics/white_dune/Makefile @@ -9,7 +9,7 @@ PORTNAME= white_dune PORTVERSION= ${DISTVERSION:S/pl/./} DISTVERSION= 0.30pl5 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://vrml.cip.ica.uni-stuttgart.de/dune/ CENKES @@ -18,7 +18,7 @@ MAINTAINER= devel@stasyan.com COMMENT= Graphical VRML97 Editor and animation tool LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/graphics/white_dune/files/patch-src-pngLoad.c b/graphics/white_dune/files/patch-src-pngLoad.c new file mode 100644 index 000000000000..a95df605f2ad --- /dev/null +++ b/graphics/white_dune/files/patch-src-pngLoad.c @@ -0,0 +1,11 @@ +--- src/pngLoad.c.orig 2010-12-09 08:36:57.000000000 +0100 ++++ src/pngLoad.c 2012-05-05 08:32:20.000000000 +0200 +@@ -139,7 +139,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem reading the file */ + return 0; diff --git a/graphics/wings-devel/Makefile b/graphics/wings-devel/Makefile index 9ad36ee257a0..3ab806557c06 100644 --- a/graphics/wings-devel/Makefile +++ b/graphics/wings-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= wings PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF DIST_SUBDIR= erlang diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile index bab4adff5f19..f98047c3fadd 100644 --- a/graphics/wings/Makefile +++ b/graphics/wings/Makefile @@ -7,6 +7,7 @@ PORTNAME= wings PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF DIST_SUBDIR= erlang diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile index 75a877c1ab20..d951883dffe5 100644 --- a/graphics/wmgrabimage/Makefile +++ b/graphics/wmgrabimage/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmGrabImage PORTVERSION= 0.72 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics windowmaker MASTER_SITES= http://dockapps.org/files/12/19/ EXTRACT_SUFX= .tgz diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile index b7886fdc3f16..6ebc0d0b588a 100644 --- a/graphics/wxsvg/Makefile +++ b/graphics/wxsvg/Makefile @@ -7,6 +7,7 @@ PORTNAME= wxsvg PORTVERSION= 1.1.8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile index 5c2171e525e4..19f2907c331c 100644 --- a/graphics/xaos/Makefile +++ b/graphics/xaos/Makefile @@ -7,14 +7,14 @@ PORTNAME= xaos PORTVERSION= 3.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics math MASTER_SITES= SF/${PORTNAME}/XaoS/${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= A real-time fractal browser for X11 and ASCII terminals -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_XORG= x11 xext GNU_CONFIGURE= yes @@ -24,7 +24,7 @@ OPTIONS= PTHREAD "Enable SMP support (experimental)" off \ GTK2 "GTK+ User Interface (experimental)" off \ NLS "Native Language Support" on -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-aa-driver=no --with-dga-driver=no \ --with-ggi-driver=no --with-svga-driver=no \ diff --git a/graphics/xaos/files/patch-png.c b/graphics/xaos/files/patch-png.c new file mode 100644 index 000000000000..17ec32ea93ab --- /dev/null +++ b/graphics/xaos/files/patch-png.c @@ -0,0 +1,20 @@ +--- src/util/png.c.orig 2009-07-18 01:50:39.000000000 +0200 ++++ src/util/png.c 2012-05-05 08:36:16.000000000 +0200 +@@ -3,6 +3,8 @@ + #include <aconfig.h> + #ifdef USE_PNG + #include <png.h> ++#include <zlib.h> ++#include <pngpriv.h> + #endif + #include <stdlib.h> + #include <stdio.h> +@@ -59,7 +61,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return "No memory to create png info structure"; + } +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(file); + return strerror(errno); diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile index 57a987ecafc1..e731e805cbe4 100644 --- a/graphics/xd3d/Makefile +++ b/graphics/xd3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= xd3d PORTVERSION= 8.3.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics math MASTER_SITES= http://www.cmap.polytechnique.fr/~jouve/xd3d/ diff --git a/graphics/xenomorph/Makefile b/graphics/xenomorph/Makefile index bf42609414ac..43e3bec49f69 100644 --- a/graphics/xenomorph/Makefile +++ b/graphics/xenomorph/Makefile @@ -8,7 +8,7 @@ PORTNAME= xenomorph PORTVERSION= 0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://xenomorph.sourceforge.net/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} diff --git a/graphics/xface.el/Makefile b/graphics/xface.el/Makefile index 5615522eca9d..03214088983e 100644 --- a/graphics/xface.el/Makefile +++ b/graphics/xface.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= xface.el PORTVERSION= 1.3.6.24 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics elisp MASTER_SITES= http://www.jpl.org/ftp/pub/elisp/ \ ftp://ftp.jpl.org/pub/elisp/ diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile index 4a17204319e0..66a621db827b 100644 --- a/graphics/xfig-devel/Makefile +++ b/graphics/xfig-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfig PORTVERSION= 3.2.5.a5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://xfig.org/software/xfig/${PORTVERSION:R}-alpha/ DISTNAME= ${PORTNAME}.${PORTVERSION:S,.a,-alpha,}.full @@ -16,7 +16,7 @@ MAINTAINER= lesi@FreeBSD.org COMMENT= A drawing program for X11 (Alpha version) LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig @@ -27,6 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION:S,.a,-alpha,} LATEST_LINK= xfig-devel USE_IMAKE= yes USE_XORG= ice sm x11 xaw xext xi xmu xpm xt +USE_GETETEXT= yes MAN1= xfig.1 MAKE_ENV+= DOCSDIR=${DOCSDIR} diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index d1a6d73aaca9..b31b62624463 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfig PORTVERSION= 3.2.5b +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/mcj/mcj_dist_src/3.0/ DISTNAME= ${PORTNAME}.${PORTVERSION}.full @@ -15,7 +16,7 @@ MAINTAINER= mjl@luckie.org.nz COMMENT= A drawing program for X11 LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ Xaw3d.8:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig @@ -49,6 +50,10 @@ PLIST_SUB+= JPORTDOCS="@comment " PLIST_SUB= JPORTDOCS="" .endif +.if !defined(WITHOUT_I18N) +USE_GETETEXT= yes +.endif + post-extract: @cd ${WRKSRC}/Doc && ${FIND} -s . -type d -print0 | ${XARGS} -0 ${CHMOD} a+rx @cd ${WRKSRC}/Doc && ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} a-x+r diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile index 032cf44fabd5..d0c26c6543ab 100644 --- a/graphics/xfpovray/Makefile +++ b/graphics/xfpovray/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfpovray PORTVERSION= 1.3.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \ ${MASTER_SITE_SUNSITE} diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index 112c655b6791..6a77a5a9e9ae 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -7,7 +7,7 @@ PORTNAME= xli PORTVERSION= 1.17.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/x/${PORTNAME} @@ -17,7 +17,7 @@ MAINTAINER= lichray@gmail.com COMMENT= Utilities to display images in X11 CONFLICTS_INSTALL= xloadimage-* -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg USE_XORG= xi diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile index b8f76ddc3ac9..a5ea0c7513b7 100644 --- a/graphics/xmedcon/Makefile +++ b/graphics/xmedcon/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmedcon PORTVERSION= 0.11.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/XMedCon-Source/${PORTVERSION} @@ -100,7 +101,7 @@ CONFIGURE_ARGS+= --disable-ljpg .if defined(WITHOUT_PNG) CONFIGURE_ARGS+= --disable-png .else -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .endif post-patch: diff --git a/graphics/xmms-vumeter/Makefile b/graphics/xmms-vumeter/Makefile index bacc47a6cf8d..e52c8ce0f97c 100644 --- a/graphics/xmms-vumeter/Makefile +++ b/graphics/xmms-vumeter/Makefile @@ -7,7 +7,7 @@ PORTNAME= vumeter PORTVERSION= 0.9.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}plugin/Plugin%20for%20XMMS PKGNAMEPREFIX= xmms- diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile index c475113cf09b..a4a78ec94715 100644 --- a/graphics/xournal/Makefile +++ b/graphics/xournal/Makefile @@ -7,7 +7,7 @@ PORTNAME= xournal PORTVERSION= 0.4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index d92872ac208d..3e2a6807d5bb 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -7,13 +7,14 @@ PORTNAME= xpaint PORTVERSION= 2.9.9 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= johans@FreeBSD.org COMMENT= A simple paint program -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ openjpeg:${PORTSDIR}/graphics/openjpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 7c40ba61b299..25d5256ef00b 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -7,6 +7,7 @@ PORTNAME= xsane PORTVERSION= 0.998 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.xsane.org/download/ \ http://gd.tuwien.ac.at/hci/sane/xsane/ \ @@ -16,7 +17,7 @@ MAINTAINER= domi@nonsensss.de COMMENT= Gtk-based X11 frontend for SANE (Scanner Access Now Easy) LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ sane.1:${PORTSDIR}/graphics/sane-backends diff --git a/graphics/xsane/files/patch-xsane-save.c b/graphics/xsane/files/patch-xsane-save.c new file mode 100644 index 000000000000..3113c7308ea3 --- /dev/null +++ b/graphics/xsane/files/patch-xsane-save.c @@ -0,0 +1,20 @@ +--- src/xsane-save.c.orig 2010-11-16 22:06:00.000000000 +0100 ++++ src/xsane-save.c 2012-05-04 07:37:59.000000000 +0200 +@@ -4910,7 +4910,7 @@ + return -1; /* error */ + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); + xsane_back_gtk_error(buf, TRUE); +@@ -5100,7 +5100,7 @@ + return -1; /* error */ + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); + xsane_back_gtk_error(buf, TRUE); diff --git a/graphics/xsvg/Makefile b/graphics/xsvg/Makefile index 11429167c4a2..bec89a205c2d 100644 --- a/graphics/xsvg/Makefile +++ b/graphics/xsvg/Makefile @@ -8,7 +8,7 @@ PORTNAME= xsvg PORTVERSION= 0.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 0df550fe7016..e4f23ce506e3 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -7,7 +7,7 @@ PORTNAME= xv PORTVERSION= 3.10a -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES+= graphics MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/:base \ SF/png-mng/XV%20jumbo%20patches/20070520 @@ -24,7 +24,7 @@ COMMENT?= An X11 program that displays images of various formats LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jasper.4:${PORTSDIR}/graphics/jasper USE_IMAKE= yes @@ -34,6 +34,7 @@ MAN1= bggen.1 vdcomp.1 xcmap.1 xv.1 xvp2p.1 .endif XVDIST= ${DISTDIR}/${DIST_SUBDIR} +CFLAGS+= -I${LOCALBASE}/include/libpng15 pre-patch: @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/xv-3.10a-jumbo-fix-enh-patch-20070520.txt diff --git a/graphics/xv/files/patch-xvpng.c b/graphics/xv/files/patch-xvpng.c new file mode 100644 index 000000000000..f7df0484feda --- /dev/null +++ b/graphics/xv/files/patch-xvpng.c @@ -0,0 +1,38 @@ +--- xvpng.c.orig 2007-05-14 02:53:28.000000000 +0200 ++++ xvpng.c 2012-04-27 07:51:56.000000000 +0200 +@@ -32,6 +32,8 @@ + #ifdef HAVE_PNG + + #include "png.h" ++#include "zlib.h" ++#include "pngpriv.h" + + /*** Stuff for PNG Dialog box ***/ + #define PWIDE 318 +@@ -458,7 +460,7 @@ + FatalError(software); + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return -1; + } +@@ -921,7 +923,7 @@ + FatalError("malloc failure in LoadPNG"); + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + fclose(fp); + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + if (!read_anything) { +@@ -1143,7 +1145,7 @@ + { + SetISTR(ISTR_WARNING,"%s: libpng error: %s", fbasename, message); + +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile index ebcb2c9f6b1f..b341ff994fa0 100644 --- a/graphics/xzgv/Makefile +++ b/graphics/xzgv/Makefile @@ -7,7 +7,7 @@ PORTNAME= xzgv PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ diff --git a/graphics/yagf/Makefile b/graphics/yagf/Makefile index 94f80f8a8bcd..46d1405a7bd3 100644 --- a/graphics/yagf/Makefile +++ b/graphics/yagf/Makefile @@ -7,7 +7,7 @@ PORTNAME= yagf PORTVERSION= 0.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://symmetrica.net/cuneiform-linux/ diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile index ba55333274fb..02cea53a3f5e 100644 --- a/graphics/zathura/Makefile +++ b/graphics/zathura/Makefile @@ -7,7 +7,7 @@ PORTNAME= zathura PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics print MASTER_SITES= http://pwmt.org/projects/zathura/download/ diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile index ca2468b7d87d..c221c3c16a1c 100644 --- a/graphics/zbar/Makefile +++ b/graphics/zbar/Makefile @@ -7,7 +7,7 @@ PORTNAME= zbar PORTVERSION= 0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/zgv/Makefile b/graphics/zgv/Makefile index 3d932c76a92e..de4a32000361 100644 --- a/graphics/zgv/Makefile +++ b/graphics/zgv/Makefile @@ -7,7 +7,7 @@ PORTNAME= zgv PORTVERSION= 5.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/viewers/svga @@ -18,7 +18,7 @@ COMMENT= Graphics viewer for SVGAlib LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ vga.1:${PORTSDIR}/graphics/svgalib \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png ONLY_FOR_ARCHS= i386 USE_GMAKE= yes diff --git a/graphics/zgv/files/patch-readpng.c b/graphics/zgv/files/patch-readpng.c new file mode 100644 index 000000000000..e1983a329799 --- /dev/null +++ b/graphics/zgv/files/patch-readpng.c @@ -0,0 +1,20 @@ +--- src/readpng.c.orig 2004-10-31 16:00:23.000000000 +0100 ++++ src/readpng.c 2012-05-06 16:05:53.000000000 +0200 +@@ -63,7 +63,7 @@ + use_errmsg=1; + + /* cleanup is done after jump back, so just do that now... */ +-longjmp(png_ptr->jmpbuf,1); ++longjmp( png_jmpbuf(png_ptr),1); + } + + +@@ -132,7 +132,7 @@ + return(_PICERR_NOMEM); + } + +-if(setjmp(png_ptr->jmpbuf)) ++if(setjmp(png_jmpbuf(png_ptr))) + { + /* if we get here, there was an error. */ + /* don't use local variables here, they may have been blasted */ diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile index 63e7058bdc92..e4746f1f4bfc 100644 --- a/graphics/zimg/Makefile +++ b/graphics/zimg/Makefile @@ -7,7 +7,7 @@ PORTNAME= zimg PORTVERSION= 5.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/zint/Makefile b/graphics/zint/Makefile index 855a2adf6fa3..f366002fc0ad 100644 --- a/graphics/zint/Makefile +++ b/graphics/zint/Makefile @@ -7,6 +7,7 @@ PORTNAME= zint PORTVERSION= 2.4.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ @@ -15,7 +16,7 @@ COMMENT= Zint Barcode Generator LICENSE= GPLv3 -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_CMAKE= yes USE_LDCONFIG= yes diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile index 21384074e10e..b5ae191d02af 100644 --- a/graphics/zphoto/Makefile +++ b/graphics/zphoto/Makefile @@ -7,7 +7,7 @@ PORTNAME= zphoto PORTVERSION= 1.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics www MASTER_SITES= http://namazu.org/~satoru/zphoto/ MASTER_SITE_SUBDIR= ${PORTNAME} |