From owner-svn-ports-head@FreeBSD.ORG Fri Aug 9 14:06:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DDFC5D86; Fri, 9 Aug 2013 14:06:02 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C89E42A30; Fri, 9 Aug 2013 14:06:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r79E62A1062631; Fri, 9 Aug 2013 14:06:02 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r79E5rsJ062561; Fri, 9 Aug 2013 14:05:53 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201308091405.r79E5rsJ062561@svn.freebsd.org> From: Dirk Meyer Date: Fri, 9 Aug 2013 14:05:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324437 - in head: astro/rmap audio/enscribe audio/mp3plot biology/emboss biology/genpak cad/pcb cad/salome devel/cvsgraph devel/m17n-lib emulators/fceux games/mkhexgrid games/openliero... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Aug 2013 14:06:03 -0000 Author: dinoex Date: Fri Aug 9 14:05:52 2013 New Revision: 324437 URL: http://svnweb.freebsd.org/changeset/ports/324437 Log: - update libdg to 2.1.0 Added: head/graphics/gd/files/makefonts (contents, props changed) Deleted: head/graphics/gd/files/Makefile.bsd head/graphics/gd/files/configure head/graphics/gd/files/patch-cve-2009-3546 head/graphics/gd/files/patch-gd_gif_out.c Modified: head/astro/rmap/Makefile head/audio/enscribe/Makefile head/audio/mp3plot/Makefile head/biology/emboss/Makefile head/biology/genpak/Makefile head/cad/pcb/Makefile head/cad/salome/Makefile.ext head/devel/cvsgraph/Makefile head/devel/m17n-lib/Makefile head/emulators/fceux/Makefile head/games/mkhexgrid/Makefile head/games/openlierox/Makefile head/graphics/R-cran-GDD/Makefile head/graphics/a2png/Makefile head/graphics/aolserver-nsgd/Makefile head/graphics/dataplot/Makefile head/graphics/fly/Makefile head/graphics/g2/Makefile head/graphics/gd/Makefile head/graphics/gd/distinfo head/graphics/gd/files/patch-bdftogd head/graphics/gd/files/patch-gd_png.c head/graphics/gd/files/patch-gdtest.c head/graphics/gd/pkg-plist head/graphics/gdchart/Makefile head/graphics/gdtclft/Makefile head/graphics/grads/Makefile head/graphics/graphviz/Makefile head/graphics/icoconvert/Makefile head/graphics/libpuzzle/Makefile head/graphics/lua-gd/Makefile head/graphics/mapserver/Makefile head/graphics/mscgen/Makefile head/graphics/p5-GD/Makefile head/graphics/php-libpuzzle/Makefile head/graphics/php5-ffmpeg/Makefile head/graphics/phplot/Makefile head/graphics/png2html/Makefile head/graphics/pstoedit/Makefile head/graphics/py-gd/Makefile head/graphics/raster3d/Makefile head/graphics/repng2jpeg/Makefile head/graphics/ruby-gd/Makefile head/graphics/rubygem-gd2/Makefile head/graphics/scr2png/Makefile head/graphics/zimg/Makefile head/lang/fpc/Makefile.units head/mail/dspam/Makefile head/math/PDL/Makefile head/math/gnuplot/Makefile head/math/ploticus/Makefile head/math/plplot/Makefile head/multimedia/kissdx/Makefile head/multimedia/oggvideotools/Makefile head/net-mgmt/bandwidthd/Makefile head/net-mgmt/icinga/Makefile head/net-mgmt/macroscope/Makefile head/net-mgmt/mrtg/Makefile head/net-mgmt/nagios-devel/Makefile head/net-mgmt/nagios/Makefile head/net-mgmt/netams/Makefile head/net-mgmt/netxms/Makefile head/net-mgmt/weathermap/Makefile head/net-p2p/amule-devel/Makefile head/net-p2p/amule/Makefile head/net-p2p/mldonkey/Makefile head/net/vnstat/Makefile head/print/teTeX-base/Makefile head/print/texlive-base/Makefile head/sysutils/apcupsd/Makefile head/sysutils/nut/Makefile head/sysutils/nut22/Makefile head/sysutils/pfstat/Makefile head/textproc/modlogan/Makefile head/www/analog/Makefile head/www/asterisk-stat/Makefile head/www/awffull/Makefile head/www/http-analyze/Makefile head/www/mgstat/Makefile head/www/sarg/Makefile head/www/webalizer/Makefile Modified: head/astro/rmap/Makefile ============================================================================== --- head/astro/rmap/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/astro/rmap/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,14 +3,14 @@ PORTNAME= rmap PORTVERSION= 1.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= astro geography MASTER_SITES= http://www.reza.net/rmap/ MAINTAINER= ports@FreeBSD.org COMMENT= Generates images of the Earth centered at a particular location -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd MAN1= rmap.1 GNU_CONFIGURE= yes Modified: head/audio/enscribe/Makefile ============================================================================== --- head/audio/enscribe/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/audio/enscribe/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -7,7 +7,7 @@ PORTNAME= enscribe PORTVERSION= 0.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio graphics MASTER_SITES= http://www.coppercloudmusic.com/enscribe/ EXTRACT_SUFX= .tgz @@ -15,11 +15,11 @@ EXTRACT_SUFX= .tgz MAINTAINER= sylvio@FreeBSD.org COMMENT= Create digital audio watermark images from photographic images -LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ - gd.4:${PORTSDIR}/graphics/gd \ - jpeg.11:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile \ + gd:${PORTSDIR}/graphics/gd \ + jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ - freetype.9:${PORTSDIR}/print/freetype2 + freetype:${PORTSDIR}/print/freetype2 LICENSE= GPLv2 Modified: head/audio/mp3plot/Makefile ============================================================================== --- head/audio/mp3plot/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/audio/mp3plot/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,7 +3,7 @@ PORTNAME= mp3plot DISTVERSION= 0.6.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio MASTER_SITES= http://p.outlyer.net/mp3plot/files/ @@ -35,7 +35,7 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_L .include .if ${PORT_OPTIONS:MGD} -LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd .else CONFIGURE_ARGS+= --disable-gd .endif Modified: head/biology/emboss/Makefile ============================================================================== --- head/biology/emboss/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/biology/emboss/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -4,7 +4,7 @@ PORTNAME= emboss PORTVERSION= 6.2.0 RELEASE= ${PORTNAME:U}-${PORTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology MASTER_SITES= ftp://emboss.open-bio.org/pub/EMBOSS/ DISTNAME= ${RELEASE} @@ -15,7 +15,7 @@ COMMENT= A collection of open source too BUILD_DEPENDS= clustalw:${PORTSDIR}/biology/clustalw \ primer3:${PORTSDIR}/biology/primer3 -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \ png15:${PORTSDIR}/graphics/png CONFLICTS= qmail-ldap-[0-9]* digest-[0-9]* @@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --with-docroot=${DOCSDI .if !defined(WITHOUT_X11) USE_XORG= x11 USES+= motif -LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd \ +LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd \ png15:${PORTSDIR}/graphics/png .else CONFIGURE_ARGS+= --without-x Modified: head/biology/genpak/Makefile ============================================================================== --- head/biology/genpak/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/biology/genpak/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -8,7 +8,7 @@ PORTNAME= genpak PORTVERSION= 0.26 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= biology MASTER_SITES= http://www.bioinformatics.org/genpak/download/ DISTNAME= gp-${PORTVERSION} @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A set of small utilities to manipulate DNA sequences -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd USE_GMAKE= yes MAKE_ENV= GMAKE="${GMAKE}" Modified: head/cad/pcb/Makefile ============================================================================== --- head/cad/pcb/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/cad/pcb/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,7 +3,7 @@ PORTNAME= pcb PORTVERSION= 20110918 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Modified: head/cad/salome/Makefile.ext ============================================================================== --- head/cad/salome/Makefile.ext Fri Aug 9 13:43:59 2013 (r324436) +++ head/cad/salome/Makefile.ext Fri Aug 9 14:05:52 2013 (r324437) @@ -252,7 +252,7 @@ CONFIGURE_ENV+= MED2HOME=${LOCALBASE} #Dependency from gd .if ${SAL_MODULE} == "sierpinsky" -LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd .endif .if ${SAL_MODULE} == "yacs" Modified: head/devel/cvsgraph/Makefile ============================================================================== --- head/devel/cvsgraph/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/devel/cvsgraph/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,14 +3,14 @@ PORTNAME= cvsgraph PORTVERSION= 1.7.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel graphics MASTER_SITES= http://www.akhphd.au.dk/~bertho/cvsgraph/release/ MAINTAINER= ports@FreeBSD.org COMMENT= Graph the life story of a file under CVS or RCS -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: head/devel/m17n-lib/Makefile ============================================================================== --- head/devel/m17n-lib/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/devel/m17n-lib/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,6 +3,7 @@ PORTNAME= m17n-lib PORTVERSION= 1.6.4 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= m17n Modified: head/emulators/fceux/Makefile ============================================================================== --- head/emulators/fceux/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/emulators/fceux/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,6 +3,7 @@ PORTNAME= fceux PORTVERSION= 2.2.1.1 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= SF/fceultra/Source%20Code/${PORTVERSION:R}%20src/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src Modified: head/games/mkhexgrid/Makefile ============================================================================== --- head/games/mkhexgrid/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/games/mkhexgrid/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -7,7 +7,7 @@ PORTNAME= mkhexgrid PORTVERSION= 0.1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://www.nomic.net/~uckelman/mkhexgrid/releases/ \ http://aaron.daltons.ca/freebsd/ @@ -19,7 +19,7 @@ COMMENT= A fully-configurable hex grid g LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/lexical_cast.hpp:${PORTSDIR}/devel/boost-libs -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd USE_GMAKE= yes Modified: head/games/openlierox/Makefile ============================================================================== --- head/games/openlierox/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/games/openlierox/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,7 +3,7 @@ PORTNAME= openlierox DISTVERSION= 0.59_beta10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/OpenLieroX%20${DISTVERSION:C/_/%20/} DISTNAME= OpenLieroX_${DISTVERSION}.src Modified: head/graphics/R-cran-GDD/Makefile ============================================================================== --- head/graphics/R-cran-GDD/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/R-cran-GDD/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 creat 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} Modified: head/graphics/a2png/Makefile ============================================================================== --- head/graphics/a2png/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/a2png/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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/ Modified: head/graphics/aolserver-nsgd/Makefile ============================================================================== --- head/graphics/aolserver-nsgd/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/aolserver-nsgd/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 Modified: head/graphics/dataplot/Makefile ============================================================================== --- head/graphics/dataplot/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/dataplot/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 \ Modified: head/graphics/fly/Makefile ============================================================================== --- head/graphics/fly/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/fly/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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/ww 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= * Modified: head/graphics/g2/Makefile ============================================================================== --- head/graphics/g2/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/g2/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 Modified: head/graphics/gd/Makefile ============================================================================== --- head/graphics/gd/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/gd/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 +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 Modified: head/graphics/gd/distinfo ============================================================================== --- head/graphics/gd/distinfo Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/gd/distinfo Fri Aug 9 14:05:52 2013 (r324437) @@ -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 Added: head/graphics/gd/files/makefonts ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gd/files/makefonts Fri Aug 9 14:05:52 2013 (r324437) @@ -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 Modified: head/graphics/gd/files/patch-bdftogd ============================================================================== --- head/graphics/gd/files/patch-bdftogd Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/gd/files/patch-bdftogd Fri Aug 9 14:05:52 2013 (r324437) @@ -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; Modified: head/graphics/gd/files/patch-gd_png.c ============================================================================== --- head/graphics/gd/files/patch-gd_png.c Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/gd/files/patch-gd_png.c Fri Aug 9 14:05:52 2013 (r324437) @@ -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); Modified: head/graphics/gd/files/patch-gdtest.c ============================================================================== --- head/graphics/gd/files/patch-gdtest.c Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/gd/files/patch-gdtest.c Fri Aug 9 14:05:52 2013 (r324437) @@ -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); Modified: head/graphics/gd/pkg-plist ============================================================================== --- head/graphics/gd/pkg-plist Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/gd/pkg-plist Fri Aug 9 14:05:52 2013 (r324437) @@ -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 Modified: head/graphics/gdchart/Makefile ============================================================================== --- head/graphics/gdchart/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/gdchart/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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= Modified: head/graphics/gdtclft/Makefile ============================================================================== --- head/graphics/gdtclft/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/gdtclft/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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} Modified: head/graphics/grads/Makefile ============================================================================== --- head/graphics/grads/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/grads/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 S 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 Modified: head/graphics/graphviz/Makefile ============================================================================== --- head/graphics/graphviz/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/graphviz/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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/ Modified: head/graphics/icoconvert/Makefile ============================================================================== --- head/graphics/icoconvert/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/icoconvert/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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/downloa 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 Modified: head/graphics/libpuzzle/Makefile ============================================================================== --- head/graphics/libpuzzle/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/libpuzzle/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 picture LICENSE= BSD -LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd USE_BZIP2= yes GNU_CONFIGURE= yes Modified: head/graphics/lua-gd/Makefile ============================================================================== --- head/graphics/lua-gd/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/lua-gd/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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/ Modified: head/graphics/mapserver/Makefile ============================================================================== --- head/graphics/mapserver/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/mapserver/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 shp 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 Modified: head/graphics/mscgen/Makefile ============================================================================== --- head/graphics/mscgen/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/mscgen/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 Modified: head/graphics/p5-GD/Makefile ============================================================================== --- head/graphics/p5-GD/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/p5-GD/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 Modified: head/graphics/php-libpuzzle/Makefile ============================================================================== --- head/graphics/php-libpuzzle/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/php-libpuzzle/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 Modified: head/graphics/php5-ffmpeg/Makefile ============================================================================== --- head/graphics/php5-ffmpeg/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/php5-ffmpeg/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 Modified: head/graphics/phplot/Makefile ============================================================================== --- head/graphics/phplot/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/phplot/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,6 +3,7 @@ PORTNAME= phplot PORTVERSION= 6.1.0 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= SF:source1 \ SF/${PORTNAME}/Manual/20130511:source2 Modified: head/graphics/png2html/Makefile ============================================================================== --- head/graphics/png2html/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/png2html/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 Modified: head/graphics/pstoedit/Makefile ============================================================================== --- head/graphics/pstoedit/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/pstoedit/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,6 +3,7 @@ PORTNAME= pstoedit PORTVERSION= 3.62 +PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= SF Modified: head/graphics/py-gd/Makefile ============================================================================== --- head/graphics/py-gd/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/py-gd/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,6 +3,7 @@ PORTNAME= gd PORTVERSION= 0.58 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/graphics/raster3d/Makefile ============================================================================== --- head/graphics/raster3d/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/raster3d/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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 ras 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 Modified: head/graphics/repng2jpeg/Makefile ============================================================================== --- head/graphics/repng2jpeg/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/repng2jpeg/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -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} Modified: head/graphics/ruby-gd/Makefile ============================================================================== --- head/graphics/ruby-gd/Makefile Fri Aug 9 13:43:59 2013 (r324436) +++ head/graphics/ruby-gd/Makefile Fri Aug 9 14:05:52 2013 (r324437) @@ -3,7 +3,7 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***