diff options
Diffstat (limited to 'graphics')
39 files changed, 209 insertions, 283 deletions
diff --git a/graphics/R-cran-GDD/Makefile b/graphics/R-cran-GDD/Makefile index 698ec7f4d5ae..9998e002c284 100644 --- a/graphics/R-cran-GDD/Makefile +++ b/graphics/R-cran-GDD/Makefile @@ -3,7 +3,7 @@ PORTNAME= GDD DISTVERSION= 0.1-13.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -12,7 +12,7 @@ COMMENT= Graphics device for R for creating bitmap output LICENSE= GPLv2 -BUILD_DEPENDS= gd>=2.0.35_8,1:${PORTSDIR}/graphics/gd +BUILD_DEPENDS= libgd>=2.0.35_8,1:${PORTSDIR}/graphics/gd RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/graphics/a2png/Makefile b/graphics/a2png/Makefile index bd03e838e060..ea8122220871 100644 --- a/graphics/a2png/Makefile +++ b/graphics/a2png/Makefile @@ -7,21 +7,24 @@ PORTNAME= a2png PORTVERSION= 0.1.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Converts plain ASCII text into PNG bitmap images -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gd +CFLAGS+= -DDEFAULT_FONTPATH='\"${FONTROOTDIR}/TTF:${FONTROOTDIR}/Type1:${FONTROOTDIR}\"' MAN1= ${PORTNAME}.1 PLIST_FILES= bin/${PORTNAME} +FONTROOTDIR?= ${LOCALBASE}/lib/X11/fonts + do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/ @${INSTALL_MAN} ${WRKSRC}/man/${MAN1} ${MAN1PREFIX}/man/man1/ diff --git a/graphics/aolserver-nsgd/Makefile b/graphics/aolserver-nsgd/Makefile index 51b80d465c5b..9b6d959aa318 100644 --- a/graphics/aolserver-nsgd/Makefile +++ b/graphics/aolserver-nsgd/Makefile @@ -7,7 +7,7 @@ PORTNAME= nsgd PORTVERSION= 2.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics www MASTER_SITES= http://www.aolserver.cz/download/ PKGNAMEPREFIX= aolserver- @@ -23,7 +23,7 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR} AOLSERVERBASE?= aolserver -LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd BUILD_DEPENDS+= ${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver RUN_DEPENDS+= ${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile index 1f8c79b53cf3..1c848050bd25 100644 --- a/graphics/dataplot/Makefile +++ b/graphics/dataplot/Makefile @@ -7,7 +7,7 @@ PORTNAME= dataplot PORTVERSION= 20090821 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.nist.gov/pub/dataplot/unix/:source \ LOCAL/beech:source \ diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index a226d82feb70..75839cb26cca 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -7,7 +7,7 @@ PORTNAME= fly PORTVERSION= 2.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://fossies.org/unix/www/ \ http://martin.gleeson.com/fly/dist/ @@ -15,7 +15,7 @@ MASTER_SITES= http://fossies.org/unix/www/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Simple drawing language to generate GIFs on the fly -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd PORTDOCS= * PORTEXAMPLES= * diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile index c5cea55def16..e8ed744e4842 100644 --- a/graphics/g2/Makefile +++ b/graphics/g2/Makefile @@ -7,7 +7,7 @@ PORTNAME= g2 PORTVERSION= 0.40 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= libs/graphics @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= libs/graphics MAINTAINER= ports@FreeBSD.org COMMENT= Easy to use, portable, and powerful 2D graphics library -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 4a28e68c0fde..a316a98f89cd 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,74 +1,83 @@ # Created by: jeff@cetlink.net # $FreeBSD$ -PORTNAME= gd -PORTVERSION= 2.0.35 -PORTREVISION?= 9 +PORTNAME= libgd +PORTVERSION= 2.1.0 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES+= graphics -MASTER_SITES= http://www.libgd.org/releases/ \ - ${MASTER_SITE_RINGSERVER} -MASTER_SITE_SUBDIR= graphics/gd -PKGNAMESUFFIX?= ${NOX11_SUFFIX}${PKGNAMESUFFIX2} +MASTER_SITES= http://cdn.bitbucket.org/libgd/gd-libgd/downloads/ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= A graphics library for fast creation of images LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ + tiff:${PORTSDIR}/graphics/tiff \ png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 CONFLICTS= bazaar-1.* -USE_BZIP2= yes -SCRIPTDIR= ${FILESDIR} -MAKE_ENV= WRKSRC="${WRKSRC}" -MAKEFILE= ${FILESDIR}/Makefile.bsd -CPPFLAGS+= -DHAVE_ERRNO_H -DHAVE_FT2BUILD_H -DHAVE_LIBFREETYPE -DHAVE_LIBJPEG -DHAVE_LIBPNG \ - -DHAVE_LIBZ -DHAVE_STDDEF_H -DHAVE_STDINT_H -DHAVE_STDLIB_H -LDFLAGS+= -L${WRKSRC} -LDFLAGS2= -L${PREFIX}/lib -L${LOCALBASE}/lib -FEATURES= GD_JPEG GD_FREETYPE GD_PNG GD_GIF GD_GIFANIM GD_OPENPOLYGON +USE_XZ= yes +USES= pkgconfig +GNU_CONFIGURE= yes +GNU_CONFIGURE_ENV= PKG_CONFIG_LIBDIR=${LOCALBASE}/libdata/pkgconfig +GNU_CONFIGURE_ARGS= USE_LDCONFIG= yes WANT_PERL= yes -OPTIONS_DEFINE= FONTCONFIG ICONV XPM +OPTIONS_DEFINE= FONTCONFIG ICONV VPX XPM OPTIONS_DEFAULT=FONTCONFIG NO_OPTIONS_SORT=yes .include <bsd.port.options.mk> +PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig +# force gdlib-config --ldflags +LDFLAGS+= -L${LOCALBASE}/lib + .if ${PORT_OPTIONS:MFONTCONFIG} LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig -CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_LIBFONTCONFIG -DHAVE_PTHREAD ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -lfontconfig -LDFLAGS2+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -FEATURES+= GD_FONTCONFIG +.else +GNU_CONFIGURE_ARGS+= --with-fontconfig=no .endif .if ${PORT_OPTIONS:MICONV} USES+= iconv -CPPFLAGS+= -DHAVE_ICONV -DHAVE_ICONV_H -DHAVE_ICONV_T_DEF -LDFLAGS+= -L${LOCALBASE}/lib -liconv +GNU_CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE} +.else +GNU_CONFIGURE_ARGS+= --without-libiconv +GNU_CONFIGURE_ARGS+= --with-libiconv-prefix=no +.endif + +.if ${PORT_OPTIONS:MVPX} +LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx +.else +CONFIGURE_ARGS+= --without-vpx .endif # honor global WITHOUT_X11 .if !defined(WITHOUT_X11) .if ${PORT_OPTIONS:MXPM} USE_XORG= xpm x11 -CPPFLAGS+= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include -DHAVE_LIBXPM -LDFLAGS+= -L${LOCALBASE}/lib -lXpm -lX11 -LDFLAGS2+= -L${LOCALBASE}/lib -FEATURES+= GD_XPM +GNU_CONFIGURE_ARGS+= --with-x +.else +GNU_CONFIGURE_ARGS+= --with-xpm=no .endif .endif -FONTBASE= ${LOCALBASE}/lib/X11/fonts - -# supprt for bitmap fonts +# The GD_FONTS environment variable can be set to specify the gzipped +# tar-ball containing the fonts in bdf format and the bdf file names. +# The tarball is the first argument, the tiny, small, medium-bold, +# large, and giant fonts follow. +# +# For example: +# GD_FONTS="/usr/ports/distfiles/x-koi8u.tgz koi6x10.bdf koi8x13.bdf \ +# koi9x15.bdf koi12x24.bdf koi10x20.bdf" +# .if defined(GD_FONTS) USE_PERL5_BUILD= yes -SCRIPTS_ENV+= GD_FONTS="${GD_FONTS}" +WRKFONTS= ${WRKSRC}/src .endif pre-extract:: @@ -76,30 +85,47 @@ pre-extract:: @${ECHO_MSG} "GD_FONTS can be set to specify an alternative list of .bdf files" @${ECHO_MSG} "" -post-configure: - ${SED} -e 's|@libdir@|${PREFIX}/lib|' \ - -e 's|@includedir@|${PREFIX}/include|' \ - -e 's|@VERSION@|${PORTVERSION}|' \ - -e 's|@GDLIB_MAJOR@|${PORTVERSION:C/([0-9]*).*/\1/1}|' \ - -e 's|@GDLIB_MINOR@|${PORTVERSION:C/[0-9]*[.]([0-9]).*/\1/1}|' \ - -e 's|@GDLIB_REVISION@|${PORTVERSION:C/.*[.]([0-9]*)/\1/1}|' \ - -e 's|@LDFLAGS@|${LDFLAGS2}|' \ - -e 's|@LIBS@|-lgd|' \ - -e 's|@LIBICONV@|${LIBICONV}|' \ - -e 's|@FEATURES@|${FEATURES}|' \ - ${WRKSRC}/config/gdlib-config.in \ - > ${WRKDIR}/gdlib-config +post-extract: +.if defined(GD_FONTS) + cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts extract ${GD_FONTS} +.endif + +pre-configure: +.if defined(GD_FONTS) + cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts configure ${GD_FONTS} +.endif + # force PKGCONFIGDIR + ${REINPLACE_CMD} \ + -e 's|^pkgconfigdir =.*|pkgconfigdir = ${PKGCONFIGDIR}|' \ + ${WRKSRC}/config/Makefile.in + # bump shlib version ${REINPLACE_CMD} \ - -e 's|#define DEFAULT_FONTPATH .*|#define DEFAULT_FONTPATH "${FONTBASE}/TTF:${FONTBASE}/Type1:${FONTBASE}"|' \ - ${WRKSRC}/gd.h + -e 's|GDLIB_CURRENT=.*|GDLIB_CURRENT=5|' \ + ${WRKSRC}/configure + # workaround for broken configure +.if ! ${PORT_OPTIONS:MICONV} + ${REINPLACE_CMD} \ + -e 's|iconv|noiconv|' \ + ${WRKSRC}/configure +.endif +.if ! ${PORT_OPTIONS:MXPM} + ${REINPLACE_CMD} \ + -e 's|xpm|noxpm|' \ + ${WRKSRC}/configure +.endif +.if ! ${PORT_OPTIONS:MFONTCONFIG} + ${REINPLACE_CMD} \ + -e 's|fontconfig|nofontconfig|' \ + ${WRKSRC}/configure +.endif + +.if defined(GD_FONTS) +pre-build: + cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts build ${GD_FONTS} +.endif post-install: - ${INSTALL_DATA} ${WRKSRC}/gdfx.h ${WRKSRC}/gdhelpers.h \ + ${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \ ${PREFIX}/include/ - ${INSTALL_SCRIPT} ${WRKDIR}/gdlib-config ${PREFIX}/bin/ -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR} -.endif .include <bsd.port.mk> diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo index a124c3ab4acf..5a470af3de53 100644 --- a/graphics/gd/distinfo +++ b/graphics/gd/distinfo @@ -1,2 +1,2 @@ -SHA256 (gd-2.0.35.tar.bz2) = bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9 -SIZE (gd-2.0.35.tar.bz2) = 1212730 +SHA256 (libgd-2.1.0.tar.xz) = fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a +SIZE (libgd-2.1.0.tar.xz) = 2004304 diff --git a/graphics/gd/files/Makefile.bsd b/graphics/gd/files/Makefile.bsd deleted file mode 100644 index 6c989ec2257e..000000000000 --- a/graphics/gd/files/Makefile.bsd +++ /dev/null @@ -1,52 +0,0 @@ -# Makefile -PROGS= pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng \ - gd2togif gdcmpgif giftogd2 annotate -TESTS= gdtest gddemo gd2time gdtestft testac fontsizetest fontwheeltest -SRCS= gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c \ - gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c \ - gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \ - gdfonts.c gdfontt.c gdft.c gdfx.c gdhelpers.c gdhelpers.h \ - gdkanji.c gdtables.c gdxpm.c gd_security.c \ - wbmp.c gd_gif_in.c gd_gif_out.c -MAKEDIR=/usr/share/mk -LIB=gd -SHLIB_MAJOR=4 -SHLIB_MINOR=0 -INCS= gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \ - gdfonts.h gdfontt.h entities.h -SHLIB_NAME!= ${MAKE} -V SHLIB_NAME LIB=${LIB} \ - SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} -f ${MAKEDIR}/bsd.lib.mk - -CFLAGS+= -I${.CURDIR} -I${LOCALBASE}/include/freetype2/freetype \ - -I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \ - -DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ \ - ${CPPFLAGS} -LDADD= -L${LOCALBASE}/lib -lpng -lz -ljpeg -lfreetype -lm \ - ${LDFLAGS} - -# The package comes with tests, but without any sort of test-harness, -# to run them all automaticly. So building tests is disabled here. -mi -all: lib${LIB}.a ${SHLIB_NAME} ${PROGS} # ${TESTS} - -lib${LIB}.a ${SHLIB_NAME}: ${SRCS} - ${MAKE} LIB=${LIB} SRCS="${SRCS}" \ - SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \ - CFLAGS="${CFLAGS}" LDADD="${LDADD}" \ - -f ${MAKEDIR}/bsd.lib.mk ${.TARGET} - -${PROGS} ${TESTS}: ${SHLIB_NAME} lib${LIB}.a - ${MAKE} PROG=${.TARGET} NO_MAN=1 NOMAN=1 LDADD="-L${.CURDIR} -lgd" \ - CFLAGS="${CFLAGS}" -f ${MAKEDIR}/bsd.prog.mk - -install: - mkdir -p ${PREFIX}/include - ${MAKE} LIB=${LIB} LIBDIR=${PREFIX}/lib NOPROFILE=true NO_PROFILE=true \ - SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \ - -f ${MAKEDIR}/bsd.lib.mk install - cd ${.CURDIR} && ${BSD_INSTALL_DATA} ${INCS} ${PREFIX}/include - cd ${.CURDIR} && ${BSD_INSTALL_PROGRAM} ${PROGS} ${PREFIX}/bin/ - ${BSD_INSTALL_SCRIPT} ${.CURDIR}/bdftogd ${PREFIX}/bin/ - -.if exists(${.CURDIR}/Makefile.fonts) -.include "Makefile.fonts" -.endif diff --git a/graphics/gd/files/configure b/graphics/gd/files/configure deleted file mode 100644 index 3ab959bb3dbf..000000000000 --- a/graphics/gd/files/configure +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/graphics/gd/files/configure,v 1.1 2004-01-14 06:14:42 dinoex Exp $ - -# The GD_FONTS environment variable can be set to specify the gzipped -# tar-ball containing the fonts in bdf format and the bdf file names. -# -# For example: -# GD_FONTS="/usr/ports/distfiles/x-koi8u.tgz koi6x10.bdf koi8x13.bdf \ -# koi9x15.bdf koi12x24.bdf koi10x20.bdf" -# -# This can be usefull for slave ports, like ukrainian/gd, which may -# now provide alternative fonts easily. - -# TODO: . handle multiple archiving formats: tgz, tar.bz2, zip -# . allow for passing already extracted font-files - -if [ -z "$GD_FONTS" ] -then - echo "GD_FONTS can be set to specify an alternative list of .bdf files" - echo "See $0 for details..." - exit 0 -fi - -set $GD_FONTS -# -# The tarball is the first argument, the tiny, small, medium-bold, -# large, and giant fonts follow. -# - -tarball=$1 -shift -tar -xvzpf $tarball -C $WRKSRC $@ - -rm -f $WRKSRC/Makefile.fonts - -for font in Tiny Small MediumBold Large Giant -do - f=`echo $font | tr -d [[:lower:]] | tr [[:upper:]] [[:lower:]]` - rm -f $WRKSRC/gdfont$f.[ch] - printf 'gdfont%s.c gdfont%s.h: %s\ - perl ${.CURDIR}/bdftogd gdFont%s font%s < %s\n' \ - $f $f $1 $font $f $1 >> $WRKSRC/Makefile.fonts - shift -done diff --git a/graphics/gd/files/makefonts b/graphics/gd/files/makefonts new file mode 100644 index 000000000000..5891403d82cc --- /dev/null +++ b/graphics/gd/files/makefonts @@ -0,0 +1,31 @@ +#!/bin/sh +# $FreeBSD$ + +target="${1}" +shift +tarball="${1}" +shift +fonts="Tiny Small MediumBold Large Giant" +case "${target}" in +extract) + tar -xvzpf "${tarball}" $@ + ;; +configure) + for font in ${fonts} + do + f=`echo "${font}" | tr -d [[:lower:]] | tr [[:upper:]] [[:lower:]]` + mv -v "gdfont${f}.c" "gdfont${f}.c.dist" + mv -v "gdfont${f}.h" "gdfont${f}.h.dist" + done + ;; +build) + set -x + for font in ${fonts} + do + f=`echo "${font}" | tr -d [[:lower:]] | tr [[:upper:]] [[:lower:]]` + perl ./bdftogd "gdFont${font}" "font${f}" < "${1}" + shift + done + ;; +esac +# eof diff --git a/graphics/gd/files/patch-bdftogd b/graphics/gd/files/patch-bdftogd index f77dbb34a2cd..b0eb14d63c05 100644 --- a/graphics/gd/files/patch-bdftogd +++ b/graphics/gd/files/patch-bdftogd @@ -1,5 +1,5 @@ ---- bdftogd.orig Fri Feb 2 18:41:00 2007 -+++ bdftogd Tue Feb 13 19:55:02 2007 +--- src/bdftogd.orig 2013-06-25 11:58:23.000000000 +0200 ++++ src/bdftogd 2013-08-01 07:06:11.000000000 +0200 @@ -24,6 +24,9 @@ my $filename = shift; $filename = 'gd' . $filename unless $filename =~ /^gd/i; diff --git a/graphics/gd/files/patch-cve-2009-3546 b/graphics/gd/files/patch-cve-2009-3546 deleted file mode 100644 index f483039105b8..000000000000 --- a/graphics/gd/files/patch-cve-2009-3546 +++ /dev/null @@ -1,15 +0,0 @@ -Adopted-From: http://svn.php.net/viewvc/php/php-src/branches/PHP_5_2/ext/gd/libgd/gd_gd.c?r1=289557&r2=289556&pathrev=289557&view=patch - ---- gd_gd.c.orig 2006-04-05 19:52:22.000000000 +0400 -+++ gd_gd.c 2009-11-06 18:06:50.000000000 +0300 -@@ -44,6 +44,10 @@ - { - goto fail1; - } -+ if (im->colorsTotal > gdMaxColors) -+ { -+ goto fail1; -+ } - } - /* Int to accommodate truecolor single-color transparency */ - if (!gdGetInt (&im->transparent, in)) diff --git a/graphics/gd/files/patch-gd_gif_out.c b/graphics/gd/files/patch-gd_gif_out.c deleted file mode 100644 index 95ce116472c3..000000000000 --- a/graphics/gd/files/patch-gd_gif_out.c +++ /dev/null @@ -1,24 +0,0 @@ ---- gd_gif_out.c~ 2007-01-04 15:44:31.000000000 +0300 -+++ gd_gif_out.c 2013-06-13 17:11:11.000000000 +0400 -@@ -586,9 +586,9 @@ - int InitCodeSize; - int i; - GifCtx ctx; -+ memset(&ctx, 0, sizeof(ctx)); - ctx.Interlace = GInterlace; - ctx.in_count = 1; -- memset(&ctx, 0, sizeof(ctx)); - ColorMapSize = 1 << BitsPerPixel; - - RWidth = ctx.Width = GWidth; -@@ -735,9 +735,9 @@ - int InitCodeSize; - int i; - GifCtx ctx; -+ memset(&ctx, 0, sizeof(ctx)); - ctx.Interlace = GInterlace; - ctx.in_count = 1; -- memset(&ctx, 0, sizeof(ctx)); - ColorMapSize = 1 << BitsPerPixel; - - if (LeftOfs < 0) LeftOfs = 0; diff --git a/graphics/gd/files/patch-gd_png.c b/graphics/gd/files/patch-gd_png.c index d0af770b29da..34b0c0a4b665 100644 --- a/graphics/gd/files/patch-gd_png.c +++ b/graphics/gd/files/patch-gd_png.c @@ -1,28 +1,17 @@ ---- gd_png.c.orig 2007-06-14 21:51:41.000000000 +0200 -+++ gd_png.c 2010-03-28 11:23:08.000000000 +0200 -@@ -149,7 +149,7 @@ - return NULL; - } +--- src/gd_png.c.orig 2013-06-25 11:58:23.000000000 +0200 ++++ src/gd_png.c 2013-08-01 07:08:18.000000000 +0200 +@@ -196,6 +196,14 @@ + png_read_info (png_ptr, info_ptr); /* read all PNG info up to image data */ -- if (!png_check_sig (sig, 8)) { /* bad signature */ -+ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ - return NULL; /* bad signature */ - } - -@@ -193,6 +193,16 @@ - png_read_info (png_ptr, info_ptr); /* read all PNG info up to image data */ - - png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); -+ -+ if (overflow2(sizeof (int), width)) -+ { -+ return NULL; -+ } -+ if (overflow2(sizeof (int) * width, height)) -+ { -+ return NULL; -+ } + png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); ++ ++ if (overflow2(sizeof (int), width)) { ++ return NULL; ++ } ++ if (overflow2(sizeof (int) * width, height)) { ++ return NULL; ++ } + - if ((color_type == PNG_COLOR_TYPE_RGB) || (color_type == PNG_COLOR_TYPE_RGB_ALPHA)) { - im = gdImageCreateTrueColor ((int) width, (int) height); - } else { + if ((color_type == PNG_COLOR_TYPE_RGB) || (color_type == PNG_COLOR_TYPE_RGB_ALPHA) + || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { + im = gdImageCreateTrueColor ((int) width, (int) height); diff --git a/graphics/gd/files/patch-gdtest.c b/graphics/gd/files/patch-gdtest.c index b9514c5fa67d..e76e47ddd61a 100644 --- a/graphics/gd/files/patch-gdtest.c +++ b/graphics/gd/files/patch-gdtest.c @@ -1,17 +1,17 @@ ---- gdtest.c.orig Sat Feb 3 02:41:00 2007 -+++ gdtest.c Sat Feb 17 14:09:35 2007 -@@ -36,6 +36,8 @@ - gdSink imgsnk; - int foreground; - int i; -+ gdIOCtx *ctx; -+ - if (argc != 2) - { - fprintf (stderr, "Usage: gdtest filename.png\n"); -@@ -58,6 +60,35 @@ +--- src/gdtest.c.orig 2013-06-25 11:58:23.000000000 +0200 ++++ src/gdtest.c 2013-08-01 07:12:08.000000000 +0200 +@@ -35,6 +35,8 @@ + gdSink imgsnk; + int foreground; + int i; ++ gdIOCtx *ctx; ++ + if (argc != 2) { + fprintf(stderr, "Usage: gdtest filename.png\n"); + exit (1); +@@ -55,6 +57,35 @@ - CompareImages ("Initial Versions", ref, im); + CompareImages ("Initial Versions", ref, im); + /* */ + /* Send to GIF File then Ptr */ @@ -43,16 +43,16 @@ + gdImageDestroy(im2); + ctx->gd_free(ctx); - /* */ - /* Send to PNG File then Ptr */ + /* */ + /* Send to PNG File then Ptr */ @@ -268,6 +299,10 @@ + printf ("[Merged Image has %d colours]\n", im2->colorsTotal); + CompareImages ("Merged (gdtest.png, gdtest_merge.png)", im2, im3); - printf ("[Merged Image has %d colours]\n", im2->colorsTotal); - CompareImages ("Merged (gdtest.png, gdtest_merge.png)", im2, im3); ++ out = fopen ("test/gdtest_merge_out.png", "wb"); ++ gdImagePng(im2, out); ++ fclose(out); + -+ out = fopen ("test/gdtest_merge_out.png", "wb"); -+ gdImagePng(im2, out); -+ fclose(out); + gdImageDestroy (im2); + gdImageDestroy (im3); - gdImageDestroy (im2); - gdImageDestroy (im3); diff --git a/graphics/gd/pkg-plist b/graphics/gd/pkg-plist index c3303b6189cf..620c445ca1cb 100644 --- a/graphics/gd/pkg-plist +++ b/graphics/gd/pkg-plist @@ -13,6 +13,8 @@ bin/pngtogd2 bin/webpng include/entities.h include/gd.h +include/gd_color_map.h +include/gd_errors.h include/gd_io.h include/gdcache.h include/gdfontg.h @@ -22,8 +24,9 @@ include/gdfonts.h include/gdfontt.h include/gdfx.h include/gdhelpers.h +include/gdpp.h lib/libgd.a +lib/libgd.la lib/libgd.so -lib/libgd.so.4 -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% +lib/libgd.so.5 +libdata/pkgconfig/gdlib.pc diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile index 6c366e8ca646..6c679415614d 100644 --- a/graphics/gdchart/Makefile +++ b/graphics/gdchart/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdchart PORTVERSION= 0.11.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://www.fred.net/brv/chart/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}dev MAINTAINER= ports@FreeBSD.org COMMENT= Easy to use fast C API for creating charts and graphs -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \ jpeg:${PORTSDIR}/graphics/jpeg \ freetype:${PORTSDIR}/print/freetype2 @@ -27,7 +27,7 @@ USE_LDCONFIG= yes DOCS= README.txt EXAMPLES= ft_samp.c gdc_pie_samp.c gdc_samp1.c gdc_samp2.c -.if defined(NOPROFILE) +.if defined(NO_PROFILE) PLIST_SUB+= PROFILE="@comment " .else PLIST_SUB+= PROFILE= diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile index 15b1d7b95277..61300172f246 100644 --- a/graphics/gdtclft/Makefile +++ b/graphics/gdtclft/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gdtclft PORTVERSION= 2.2.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics tcl MASTER_SITES= http://www.graphviz.org/pub/ DISTNAME= ${PORTNAME}${PORTVERSION} diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile index 55ef41a5f60c..a6ebb37fe92c 100644 --- a/graphics/grads/Makefile +++ b/graphics/grads/Makefile @@ -3,7 +3,7 @@ PORTNAME= grads PORTVERSION= 1.9b4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics science math MASTER_SITES= ftp://grads.iges.org/grads/1.9/:src \ ftp://grads.iges.org/grads/:other @@ -16,8 +16,8 @@ COMMENT= The Grid Analysis and Display System 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 \ +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \ + jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 25950217ee49..e7be0bbbca9b 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -3,7 +3,7 @@ PORTNAME= graphviz PORTVERSION= 2.30.1 -PORTREVERSION= 100 +PORTREVERSION= 101 CATEGORIES= graphics tk MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ diff --git a/graphics/icoconvert/Makefile b/graphics/icoconvert/Makefile index 786ad2e6c754..0d9c830c7a8d 100644 --- a/graphics/icoconvert/Makefile +++ b/graphics/icoconvert/Makefile @@ -7,7 +7,7 @@ PORTNAME= icoconvert PORTVERSION= 2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://www.mox.net/downloads/ \ http://www.xunix.org/~flz/distfiles/ @@ -15,7 +15,7 @@ MASTER_SITES= http://www.mox.net/downloads/ \ MAINTAINER= flz@FreeBSD.org COMMENT= A small utility to convert Windows icon files into .xpm and .png files -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd PLIST_FILES= bin/icoconvert diff --git a/graphics/libpuzzle/Makefile b/graphics/libpuzzle/Makefile index cd77aa2a5d7d..3ae8a5bff242 100644 --- a/graphics/libpuzzle/Makefile +++ b/graphics/libpuzzle/Makefile @@ -2,7 +2,7 @@ PORTNAME= libpuzzle PORTVERSION= 0.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/ @@ -11,7 +11,7 @@ COMMENT= Library to find similar pictures LICENSE= BSD -LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/graphics/lua-gd/Makefile b/graphics/lua-gd/Makefile index 19bd92e1d107..15f0713cbf4e 100644 --- a/graphics/lua-gd/Makefile +++ b/graphics/lua-gd/Makefile @@ -3,6 +3,7 @@ PORTNAME= lua-gd PORTVERSION= 2.0.33r2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}forLua5.1/ diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index da7081f5809a..2af7652e7a16 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -3,6 +3,7 @@ PORTNAME= mapserver PORTVERSION= 6.2.1 +PORTREVISION= 1 CATEGORIES= graphics www geography MASTER_SITES= http://download.osgeo.org/mapserver/ @@ -172,6 +173,8 @@ PROG_FILES= legend scalebar shp2img shptree shptreetst shptreevis \ sortshp msencrypt tile4ms post-patch: + # fix broken version check for libgd + ${REINPLACE_CMD} -e 's#-lt 28#-lt 0#' ${WRKSRC}/configure .if ${PORT_OPTIONS:MMING} ${REINPLACE_CMD} -e 's#with_ming/include#with_ming/include/ming#g' \ ${WRKSRC}/configure diff --git a/graphics/mscgen/Makefile b/graphics/mscgen/Makefile index 3f34c47b7ac8..f3f75e64d7cf 100644 --- a/graphics/mscgen/Makefile +++ b/graphics/mscgen/Makefile @@ -3,7 +3,7 @@ PORTNAME= mscgen PORTVERSION= 0.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.mcternan.me.uk/mscgen/software/ \ http://romain.blogreen.org/distfiles/ @@ -19,7 +19,7 @@ OPTIONS_DEFAULT= PNG .if ${PORT_OPTIONS:MPNG} CONFIGURE_ARGS+=--with-png -LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd .else CONFIGURE_ARGS+=--without-png .endif diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile index 9240b98106f5..74b960f8a3a7 100644 --- a/graphics/p5-GD/Makefile +++ b/graphics/p5-GD/Makefile @@ -3,6 +3,7 @@ PORTNAME= GD PORTVERSION= 2.49 +PORTREVISION0 1 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,7 +12,7 @@ DISTNAME= GD-${PORTVERSION} MAINTAINER= perl@FreeBSD.org COMMENT= Perl5 interface to Gd Graphics Library version2 -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd USES= perl5 USE_PERL5= configure diff --git a/graphics/php-libpuzzle/Makefile b/graphics/php-libpuzzle/Makefile index 47cb9a020b15..3122186883da 100644 --- a/graphics/php-libpuzzle/Makefile +++ b/graphics/php-libpuzzle/Makefile @@ -7,6 +7,7 @@ PORTNAME= libpuzzle PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://download.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/release/ \ ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/ @@ -16,7 +17,7 @@ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= PHP extension for Puzzle library to find similar pictures LIB_DEPENDS= puzzle.1:${PORTSDIR}/graphics/libpuzzle \ - gd.4:${PORTSDIR}/graphics/gd + gd:${PORTSDIR}/graphics/gd LICENSE= BSD LICENSE_FILES= ${WRKSRC}/COPYING diff --git a/graphics/php5-ffmpeg/Makefile b/graphics/php5-ffmpeg/Makefile index df9060136c33..b40e509be167 100644 --- a/graphics/php5-ffmpeg/Makefile +++ b/graphics/php5-ffmpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.6.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}-php/${PORTNAME}-php/${PORTVERSION} PKGNAMEPREFIX= php5- @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tbz2 MAINTAINER= acm@FreeBSD.org COMMENT= The ffmpeg shared extension for php -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \ avutil.1:${PORTSDIR}/multimedia/ffmpeg CFLAGS+= -I${LOCALBASE}/include diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile index a72ce94f0c7f..54b6a29a3045 100644 --- a/graphics/phplot/Makefile +++ b/graphics/phplot/Makefile @@ -3,6 +3,7 @@ PORTNAME= phplot PORTVERSION= 6.1.0 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= SF:source1 \ SF/${PORTNAME}/Manual/20130511:source2 diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile index 86960fce7a6e..836a9b0bd3ed 100644 --- a/graphics/png2html/Makefile +++ b/graphics/png2html/Makefile @@ -7,7 +7,7 @@ PORTNAME= png2html PORTVERSION= 1.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://www.geoffholden.com/content/projects/png2html/ @@ -18,7 +18,7 @@ LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - gd.4:${PORTSDIR}/graphics/gd + gd:${PORTSDIR}/graphics/gd PLIST_FILES= bin/png2html diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index b959232d1f7a..05ec83befd75 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -3,6 +3,7 @@ PORTNAME= pstoedit PORTVERSION= 3.62 +PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= SF diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index b5b60812fa6e..0d2b48f959d9 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -3,6 +3,7 @@ PORTNAME= gd PORTVERSION= 0.58 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile index f5c6775e6e9a..4aecfdd05aa8 100644 --- a/graphics/raster3d/Makefile +++ b/graphics/raster3d/Makefile @@ -3,7 +3,7 @@ PORTNAME= raster3d PORTVERSION= 3.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics biology MASTER_SITES= http://skuld.bmsc.washington.edu/${PORTNAME}/ DISTNAME= Raster3D_${PORTVERSION:R}-${PORTVERSION:E} @@ -13,8 +13,8 @@ COMMENT= Set of tools for generating raster images of proteins and molecules LICENSE= ART20 -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ - tiff.4:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \ + tiff:${PORTSDIR}/graphics/tiff OPTIONS_DEFINE= MAGICK DOCS EXAMPLES OPTIONS_DEFAULT= MAGICK diff --git a/graphics/repng2jpeg/Makefile b/graphics/repng2jpeg/Makefile index ff35542eaf52..c9c853d92429 100644 --- a/graphics/repng2jpeg/Makefile +++ b/graphics/repng2jpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= repng2jpeg PORTVERSION= 1.0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://sugachan.dip.jp/obsolete/arch/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile index 60bcb92b5ba5..fc3108867466 100644 --- a/graphics/ruby-gd/Makefile +++ b/graphics/ruby-gd/Makefile @@ -3,7 +3,7 @@ PORTNAME= gd PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics ruby MASTER_SITES= http://www.daifukuya.com/archive/kagemai/lib/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/graphics/rubygem-gd2/Makefile b/graphics/rubygem-gd2/Makefile index 2cc0e636e216..3692771d3456 100644 --- a/graphics/rubygem-gd2/Makefile +++ b/graphics/rubygem-gd2/Makefile @@ -6,14 +6,14 @@ PORTNAME= gd2 PORTVERSION= 1.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= Ruby binding for Thomas Boutell's gd 2.x graphics library #' -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd REINPLACE_ARGS= -i "" diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile index 6c3994a93ba5..79a085543efb 100644 --- a/graphics/scr2png/Makefile +++ b/graphics/scr2png/Makefile @@ -3,7 +3,7 @@ PORTNAME= scr2png PORTVERSION= 1.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= nik diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile index e4746f1f4bfc..e30f26475fe6 100644 --- a/graphics/zimg/Makefile +++ b/graphics/zimg/Makefile @@ -7,14 +7,14 @@ PORTNAME= zimg PORTVERSION= 5.0.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Image-generator that uses ASCII input files to create PNGs/EDFs -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-dynaload-cc="${CC}" \ |