From 92e0cb52cb783546e352182244f761180817e141 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Jun 2010 22:43:46 +0000 Subject: Bump PKGREVISION for libpng shlib name change. Also add some patches to remove use of deprecated symbols and fix other problems when looking for or compiling against libpng-1.4.x. --- graphics/Coin/Makefile | 4 +- graphics/Coin/buildlink3.mk | 4 +- graphics/GraphicsMagick/Makefile | 4 +- graphics/GraphicsMagick/buildlink3.mk | 4 +- graphics/ImageMagick/Makefile | 3 +- graphics/ImageMagick/buildlink3.mk | 4 +- graphics/SDL_image/Makefile | 4 +- graphics/SDL_image/buildlink3.mk | 4 +- graphics/TiffIO/Makefile | 4 +- graphics/autopano-sift-C/Makefile | 4 +- graphics/autotrace/Makefile | 4 +- graphics/aview/Makefile | 4 +- graphics/blender/Makefile | 4 +- graphics/blinkenthemes/Makefile | 4 +- graphics/blinkentools/Makefile | 4 +- graphics/cairo/Makefile | 3 +- graphics/cairo/buildlink3.mk | 4 +- graphics/cairomm/Makefile | 3 +- graphics/cairomm/buildlink3.mk | 3 +- graphics/camlimages/Makefile | 4 +- graphics/cheese/Makefile | 4 +- graphics/cinepaint/Makefile | 4 +- graphics/clutter-box2d/Makefile | 3 +- graphics/clutter-cairo/Makefile | 4 +- graphics/clutter-cairo/buildlink3.mk | 4 +- graphics/clutter-gtk/Makefile | 3 +- graphics/clutter-gtk/buildlink3.mk | 3 +- graphics/clutter-qt/Makefile | 4 +- graphics/clutter/Makefile | 3 +- graphics/clutter/buildlink3.mk | 3 +- graphics/clutter08-gtk/Makefile | 3 +- graphics/clutter08-gtk/buildlink3.mk | 3 +- graphics/clutter08/Makefile | 4 +- graphics/clutter08/buildlink3.mk | 3 +- graphics/cnxtview/Makefile | 4 +- graphics/comix/Makefile | 4 +- graphics/cpia2view/Makefile | 4 +- graphics/denemo/Makefile | 4 +- graphics/dia-python/Makefile | 4 +- graphics/dia/Makefile | 3 +- graphics/digikam-doc-kde3/Makefile | 4 +- graphics/digikam-kde3/Makefile | 4 +- graphics/digikam-kde3/distinfo | 4 +- graphics/digikam-kde3/patches/patch-aa | 13 ++++++ graphics/digikam-kde3/patches/patch-ab | 13 ++++++ graphics/digikam/Makefile | 3 +- graphics/djview4/Makefile | 4 +- graphics/dvipng/Makefile | 4 +- graphics/dx/Makefile | 4 +- graphics/enblend-enfuse/Makefile | 4 +- graphics/enblend-enfuse/distinfo | 3 +- graphics/enblend-enfuse/patches/patch-ae | 15 +++++++ graphics/eog/Makefile | 4 +- graphics/evas-png/Makefile | 4 +- graphics/evas-svg/Makefile | 4 +- graphics/extrema/Makefile | 3 +- graphics/f-spot/Makefile | 3 +- graphics/f4l/Makefile | 4 +- graphics/feh/Makefile | 4 +- graphics/flphoto/Makefile | 4 +- graphics/fly/Makefile | 4 +- graphics/fnlib/Makefile | 4 +- graphics/fnlib/buildlink3.mk | 4 +- graphics/fotoxx/Makefile | 4 +- graphics/frameworks/Makefile | 4 +- graphics/g2/Makefile | 4 +- graphics/gd/Makefile | 4 +- graphics/gd/buildlink3.mk | 4 +- graphics/gdchart/Makefile | 4 +- graphics/gdchart/buildlink3.mk | 4 +- graphics/gdk-pixbuf/Makefile | 4 +- graphics/gdk-pixbuf/buildlink3.mk | 4 +- graphics/geeqie/Makefile | 3 +- graphics/gegl/Makefile | 4 +- graphics/gegl/buildlink3.mk | 4 +- graphics/gfract/Makefile | 4 +- graphics/gif2png/Makefile | 4 +- graphics/gimageview/Makefile | 4 +- graphics/gimmage/Makefile | 4 +- graphics/gimp-color-manager/Makefile | 4 +- graphics/gimp-exif-browser/Makefile | 4 +- graphics/gimp-fix-ca/Makefile | 4 +- graphics/gimp-liquid-rescale/Makefile | 4 +- graphics/gimp-rawphoto/Makefile | 4 +- graphics/gimp-refocus-it/Makefile | 4 +- graphics/gimp-resynthesizer/Makefile | 3 +- graphics/gimp-ufraw/Makefile | 4 +- graphics/gimp/Makefile | 4 +- graphics/gimp/buildlink3.mk | 4 +- graphics/gimp/distinfo | 3 +- graphics/gimp/patches/patch-ad | 21 +++++++++ graphics/gimp1-base/Makefile | 4 +- graphics/gimp1-base/buildlink3.mk | 4 +- graphics/gimp1-data/Makefile | 4 +- graphics/gimp1-wideangle/Makefile | 4 +- graphics/gimp2-wideangle/Makefile | 4 +- graphics/giram/Makefile | 4 +- graphics/gliv/Makefile | 4 +- graphics/glpng/Makefile | 3 +- graphics/glpng/buildlink3.mk | 3 +- graphics/gmngview/Makefile | 4 +- graphics/gnuplot-nox11/Makefile | 4 +- graphics/gnuplot/Makefile | 4 +- graphics/gocr/Makefile | 4 +- graphics/goocanvas/Makefile | 4 +- graphics/goocanvas/buildlink3.mk | 4 +- graphics/goocanvasmm/Makefile | 3 +- graphics/gphoto/Makefile | 4 +- graphics/gqview-devel/Makefile | 4 +- graphics/gqview-gtk1/Makefile | 4 +- graphics/gqview/Makefile | 4 +- graphics/graphviz/Makefile | 4 +- graphics/gst-plugins0.10-cairo/Makefile | 4 +- graphics/gst-plugins0.10-png/Makefile | 4 +- graphics/gthumb/Makefile | 3 +- graphics/gtkam/Makefile | 4 +- graphics/gtkglext/Makefile | 4 +- graphics/gtkglext/buildlink3.mk | 4 +- graphics/gtkimageview/Makefile | 4 +- graphics/gtksee/Makefile | 4 +- graphics/guile-cairo/Makefile | 4 +- graphics/gwenview-i18n/Makefile | 4 +- graphics/gwenview/Makefile | 4 +- graphics/gwenview/distinfo | 3 +- graphics/gwenview/patches/patch-ab | 22 ++++++++++ graphics/h5utils/Makefile | 4 +- graphics/hp2xx/Makefile | 4 +- graphics/hugin/Makefile | 4 +- graphics/hugin/distinfo | 4 +- graphics/hugin/patches/patch-ab | 13 ++++++ graphics/hugin/patches/patch-ad | 15 +++++++ graphics/imlib/Makefile | 4 +- graphics/imlib/buildlink3.mk | 4 +- graphics/imlib2/Makefile | 4 +- graphics/imlib2/buildlink3.mk | 4 +- graphics/inkscape/Makefile | 4 +- graphics/kbarcode/Makefile | 4 +- graphics/kdegraphics3/Makefile | 4 +- graphics/kdegraphics3/buildlink3.mk | 4 +- graphics/kdegraphics4/Makefile | 3 +- graphics/kdegraphics4/buildlink3.mk | 4 +- graphics/kipi-plugins-calendar-kde3/Makefile | 4 +- graphics/kipi-plugins-kde3/Makefile | 4 +- graphics/kipi-plugins/Makefile | 4 +- graphics/koverartist/Makefile | 4 +- graphics/kphotoalbum/Makefile | 4 +- graphics/kphotobook/Makefile | 4 +- graphics/kphotools/Makefile | 4 +- graphics/lensfun/Makefile | 4 +- graphics/libexif-gtk/Makefile | 4 +- graphics/libexif-gtk/buildlink3.mk | 4 +- graphics/libgdiplus/Makefile | 3 +- graphics/libgdiplus/buildlink3.mk | 4 +- graphics/libgnomecanvas/Makefile | 3 +- graphics/libgnomecanvas/buildlink3.mk | 4 +- graphics/libgnomecanvasmm/Makefile | 4 +- graphics/libgnomecanvasmm/buildlink3.mk | 4 +- graphics/libkdcraw/Makefile | 4 +- graphics/libkdcraw/buildlink3.mk | 4 +- graphics/libkexif/Makefile | 4 +- graphics/libkexif/buildlink3.mk | 4 +- graphics/libkexiv2/Makefile | 4 +- graphics/libkexiv2/buildlink3.mk | 4 +- graphics/libkipi/Makefile | 4 +- graphics/libkipi/buildlink3.mk | 4 +- graphics/libpano13/Makefile | 4 +- graphics/libpano13/buildlink3.mk | 4 +- graphics/libpuzzle/Makefile | 4 +- graphics/libpuzzle/buildlink3.mk | 4 +- graphics/librsvg/Makefile | 3 +- graphics/librsvg/buildlink3.mk | 4 +- graphics/libscigraphica/Makefile | 4 +- graphics/libscigraphica/buildlink3.mk | 4 +- graphics/libvideogfx/Makefile | 4 +- graphics/libvideogfx/buildlink3.mk | 4 +- graphics/libwmf/Makefile | 4 +- graphics/libwmf/buildlink3.mk | 4 +- graphics/lprof/Makefile | 4 +- graphics/magicpoint/Makefile | 4 +- graphics/mgl/Makefile | 4 +- graphics/netpbm/Makefile | 3 +- graphics/netpbm/buildlink3.mk | 4 +- graphics/netpbm/distinfo | 4 +- graphics/netpbm/patches/patch-ac | 49 +++++++++++++++++++++ graphics/netpbm/patches/patch-af | 64 ++++++++++++++++++++++++++++ graphics/nvtv/Makefile | 4 +- graphics/opencv/Makefile | 4 +- graphics/optipng/Makefile | 3 +- graphics/optipng/distinfo | 3 +- graphics/optipng/patches/patch-ab | 17 ++++++++ graphics/ov519view/Makefile | 4 +- graphics/p5-GD/Makefile | 4 +- graphics/p5-Gdk-Imlib/Makefile | 4 +- graphics/p5-Gdk-Pixbuf/Makefile | 4 +- graphics/p5-Image-Imlib2/Makefile | 4 +- graphics/p5-PerlMagick/Makefile | 4 +- graphics/p5-cairo/Makefile | 3 +- graphics/p5-cairo/buildlink3.mk | 3 +- graphics/p5-clutter/Makefile | 4 +- graphics/panomatic/Makefile | 3 +- graphics/panomatic/distinfo | 3 +- graphics/panomatic/patches/patch-ad | 15 +++++++ graphics/pdiff/Makefile | 7 +-- graphics/pdiff/distinfo | 4 +- graphics/pdiff/patches/patch-aa | 42 ++++++++++++++++++ graphics/pdiff/patches/patch-ac | 32 ++++++++++++++ graphics/pfstools/Makefile | 4 +- graphics/php-gd/Makefile | 3 +- graphics/phpsview/Makefile | 4 +- graphics/pixieplus/Makefile | 4 +- graphics/ploticus/Makefile | 4 +- graphics/plotutils-nox11/Makefile | 8 ++-- graphics/plotutils-nox11/buildlink3.mk | 4 +- graphics/plotutils/Makefile | 3 +- graphics/plotutils/buildlink3.mk | 4 +- graphics/png2html/Makefile | 4 +- graphics/pngcrush/Makefile | 3 +- graphics/pornview/Makefile | 4 +- graphics/povray/Makefile | 4 +- graphics/pstoedit/Makefile | 3 +- graphics/py-biggles/Makefile | 4 +- graphics/py-cairo/Makefile | 3 +- graphics/py-cairo/buildlink3.mk | 4 +- graphics/py-clutter-gtk/Makefile | 3 +- graphics/py-clutter/Makefile | 3 +- graphics/py-clutter/buildlink3.mk | 3 +- graphics/py-gd/Makefile | 4 +- graphics/py-gdchart/Makefile | 4 +- graphics/py-goocanvas/Makefile | 4 +- graphics/py-gtkglext/Makefile | 4 +- graphics/py-matplotlib-gtk2/Makefile | 3 +- graphics/py-matplotlib-tk/Makefile | 3 +- graphics/py-matplotlib/Makefile | 3 +- graphics/py-matplotlib/distinfo | 3 +- graphics/py-matplotlib/patches/patch-ab | 13 ++++++ graphics/qcamview/Makefile | 4 +- graphics/qimageblitz/Makefile | 4 +- graphics/qimageblitz/buildlink3.mk | 4 +- graphics/qiv/Makefile | 3 +- graphics/rayshade/Makefile | 4 +- graphics/ristretto/Makefile | 3 +- graphics/ruby-RMagick/Makefile | 4 +- graphics/ruby-clutter-cairo/Makefile | 4 +- graphics/ruby-clutter-core/Makefile | 4 +- graphics/ruby-clutter-gtk/Makefile | 4 +- graphics/ruby-gd/Makefile | 4 +- graphics/ruby-gnome2-gdkpixbuf/Makefile | 3 +- graphics/ruby-gnome2-gnomecanvas/Makefile | 3 +- graphics/ruby-gnome2-goocanvas/Makefile | 3 +- graphics/ruby-gnome2-gtkglext/Makefile | 3 +- graphics/ruby-gnome2-libart/Makefile | 4 +- graphics/ruby-gnome2-rsvg/Makefile | 3 +- graphics/ruby-imlib2/Makefile | 4 +- graphics/ruby-rcairo/Makefile | 4 +- graphics/ruby-rcairo/buildlink3.mk | 3 +- graphics/sane-frontends/Makefile | 4 +- graphics/scidavis/Makefile | 4 +- graphics/scigraphica/Makefile | 4 +- graphics/scrot/Makefile | 4 +- graphics/showimg/Makefile | 4 +- graphics/simage/Makefile | 4 +- graphics/simage/buildlink3.mk | 4 +- graphics/snx101view/Makefile | 4 +- graphics/spcaview/Makefile | 4 +- graphics/tango-icon-theme/Makefile | 4 +- graphics/tuxpaint-config/Makefile | 3 +- graphics/tuxpaint/Makefile | 4 +- graphics/ucview/Makefile | 4 +- graphics/unicap/Makefile | 4 +- graphics/unicap/distinfo | 5 ++- graphics/unicap/patches/patch-an | 58 +++++++++++++++++++++++++ graphics/unicap/patches/patch-ap | 11 +---- graphics/urt/Makefile | 4 +- graphics/urt/buildlink3.mk | 4 +- graphics/vid/Makefile | 4 +- graphics/vigra/Makefile | 4 +- graphics/vigra/distinfo | 3 +- graphics/vigra/patches/patch-ab | 15 +++++++ graphics/vp/Makefile | 4 +- graphics/wxsvg/Makefile | 3 +- graphics/wxsvg/buildlink3.mk | 4 +- graphics/xart/Makefile | 4 +- graphics/xart/distinfo | 4 +- graphics/xart/patches/patch-ac | 4 +- graphics/xfce4-icon-theme/buildlink3.mk | 3 +- graphics/xfig/Makefile | 4 +- graphics/xli/Makefile | 4 +- graphics/xpaint/Makefile | 4 +- graphics/xsane/Makefile | 4 +- graphics/xv/Makefile | 4 +- graphics/xzgv/Makefile | 4 +- graphics/zphoto/Makefile | 4 +- 292 files changed, 979 insertions(+), 497 deletions(-) create mode 100644 graphics/digikam-kde3/patches/patch-aa create mode 100644 graphics/digikam-kde3/patches/patch-ab create mode 100644 graphics/enblend-enfuse/patches/patch-ae create mode 100644 graphics/gimp/patches/patch-ad create mode 100644 graphics/gwenview/patches/patch-ab create mode 100644 graphics/hugin/patches/patch-ab create mode 100644 graphics/hugin/patches/patch-ad create mode 100644 graphics/netpbm/patches/patch-ac create mode 100644 graphics/netpbm/patches/patch-af create mode 100644 graphics/optipng/patches/patch-ab create mode 100644 graphics/panomatic/patches/patch-ad create mode 100644 graphics/pdiff/patches/patch-aa create mode 100644 graphics/pdiff/patches/patch-ac create mode 100644 graphics/py-matplotlib/patches/patch-ab create mode 100644 graphics/unicap/patches/patch-an create mode 100644 graphics/vigra/patches/patch-ab (limited to 'graphics') diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile index f687ccc588a..7d0340dd793 100644 --- a/graphics/Coin/Makefile +++ b/graphics/Coin/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2010/01/18 09:58:55 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:25 wiz Exp $ DISTNAME= Coin-2.4.4 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ diff --git a/graphics/Coin/buildlink3.mk b/graphics/Coin/buildlink3.mk index fa983a7d777..92c3eac569b 100644 --- a/graphics/Coin/buildlink3.mk +++ b/graphics/Coin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:58:55 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:25 wiz Exp $ BUILDLINK_TREE+= Coin @@ -6,7 +6,7 @@ BUILDLINK_TREE+= Coin COIN_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.Coin+= Coin>=2.2.1 -BUILDLINK_ABI_DEPENDS.Coin+= Coin>=2.4.4nb5 +BUILDLINK_ABI_DEPENDS.Coin+= Coin>=2.4.4nb6 BUILDLINK_PKGSRCDIR.Coin?= ../../graphics/Coin .include "../../graphics/simage/buildlink3.mk" diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index b960760f3bb..8b1fd059e37 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2010/06/05 13:30:33 obache Exp $ +# $NetBSD: Makefile,v 1.35 2010/06/13 22:44:26 wiz Exp $ # DISTNAME= GraphicsMagick-1.3.12 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/ diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk index e4a14da45b2..cd063efac96 100644 --- a/graphics/GraphicsMagick/buildlink3.mk +++ b/graphics/GraphicsMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2010/06/05 13:30:33 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:26 wiz Exp $ BUILDLINK_TREE+= GraphicsMagick @@ -6,7 +6,7 @@ BUILDLINK_TREE+= GraphicsMagick GRAPHICSMAGICK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.GraphicsMagick+= GraphicsMagick>=1.2 -BUILDLINK_ABI_DEPENDS.GraphicsMagick?= GraphicsMagick>=1.3.12nb1 +BUILDLINK_ABI_DEPENDS.GraphicsMagick?= GraphicsMagick>=1.3.12nb2 BUILDLINK_PKGSRCDIR.GraphicsMagick?= ../../graphics/GraphicsMagick .include "../../archivers/bzip2/buildlink3.mk" diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index ec619f7ba98..bbc51f4f249 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.164 2010/05/04 11:14:23 drochner Exp $ +# $NetBSD: Makefile,v 1.165 2010/06/13 22:44:26 wiz Exp $ .include "Makefile.common" PKGNAME= ImageMagick-${DISTVERSION} +PKGREVISION= 1 MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.imagemagick.org/ diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk index c755a778cb5..edac3c12d4d 100644 --- a/graphics/ImageMagick/buildlink3.mk +++ b/graphics/ImageMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.29 2010/01/18 09:58:55 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2010/06/13 22:44:26 wiz Exp $ BUILDLINK_TREE+= ImageMagick @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ImageMagick IMAGEMAGICK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1 -BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=6.5.7.9nb1 +BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=6.6.1.5nb1 BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick pkgbase := ImageMagick diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile index 8132dc11aff..124741d4e5b 100644 --- a/graphics/SDL_image/Makefile +++ b/graphics/SDL_image/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2010/01/18 09:58:55 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:26 wiz Exp $ DISTNAME= SDL_image-1.2.10 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics devel MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk index b9e74a1c081..355bf176fb9 100644 --- a/graphics/SDL_image/buildlink3.mk +++ b/graphics/SDL_image/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:58:55 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:26 wiz Exp $ BUILDLINK_TREE+= SDL_image @@ -6,7 +6,7 @@ BUILDLINK_TREE+= SDL_image SDL_IMAGE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1 -BUILDLINK_ABI_DEPENDS.SDL_image+= SDL_image>=1.2.10nb1 +BUILDLINK_ABI_DEPENDS.SDL_image+= SDL_image>=1.2.10nb2 BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image BUILDLINK_INCDIRS.SDL_image?= include/SDL diff --git a/graphics/TiffIO/Makefile b/graphics/TiffIO/Makefile index c291a117a4b..649b2e6b116 100644 --- a/graphics/TiffIO/Makefile +++ b/graphics/TiffIO/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2010/01/18 09:58:55 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:26 wiz Exp $ # DISTNAME= TiffIO-120e PKGNAME= TiffIO-1.2.0e -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://artis.imag.fr/Software/TiffIO/SOURCES/ EXTRACT_SUFX= .tgz diff --git a/graphics/autopano-sift-C/Makefile b/graphics/autopano-sift-C/Makefile index 56b3244c014..b7835d08c70 100644 --- a/graphics/autopano-sift-C/Makefile +++ b/graphics/autopano-sift-C/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2010/01/18 09:58:56 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:26 wiz Exp $ DISTNAME= autopano-sift-C-2.5.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/} diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index 16b6a76b671..68093904d02 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2010/01/18 09:58:56 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:26 wiz Exp $ # DISTNAME= autotrace-0.31.1 -PKGREVISION= 14 +PKGREVISION= 15 CATEGORIES= graphics cad MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=autotrace/} diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile index 729fb8168d0..475a489b6ff 100644 --- a/graphics/aview/Makefile +++ b/graphics/aview/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.23 2010/01/18 09:58:56 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:26 wiz Exp $ # DISTNAME= aview-1.3.0rc1 PKGNAME= aview-1.3.0.1 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics converters MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aa-project/} diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 539d7034f91..5a252f47e99 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.71 2010/02/10 19:17:39 joerg Exp $ +# $NetBSD: Makefile,v 1.72 2010/06/13 22:44:26 wiz Exp $ DISTNAME= blender-2.49b -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://download.blender.org/source/ diff --git a/graphics/blinkenthemes/Makefile b/graphics/blinkenthemes/Makefile index 56b89dbae4c..a4ef7a2e536 100644 --- a/graphics/blinkenthemes/Makefile +++ b/graphics/blinkenthemes/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2009/08/26 19:57:36 sno Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:26 wiz Exp $ # DISTNAME= blinkenthemes-0.8 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://sven.gimp.org/blinkenlights/old/ diff --git a/graphics/blinkentools/Makefile b/graphics/blinkentools/Makefile index b7a9b71ca4d..ecf638e7562 100644 --- a/graphics/blinkentools/Makefile +++ b/graphics/blinkentools/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2010/01/18 09:58:56 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:26 wiz Exp $ # DISTNAME= blinkentools-2.2 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://sven.gimp.org/blinkenlights/old/ diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index f3331b9193f..7f094e8e47d 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.80 2010/02/21 13:02:46 wiz Exp $ +# $NetBSD: Makefile,v 1.81 2010/06/13 22:44:27 wiz Exp $ DISTNAME= cairo-1.8.10 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk index 2fbbbf15ff5..143224e086a 100644 --- a/graphics/cairo/buildlink3.mk +++ b/graphics/cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:37 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.32 2010/06/13 22:44:27 wiz Exp $ BUILDLINK_TREE+= cairo @@ -6,7 +6,7 @@ BUILDLINK_TREE+= cairo CAIRO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2 -BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.6.4 +BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.8.10nb1 BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index 16303d867ae..908912a8ca5 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2009/10/22 08:47:23 adam Exp $ +# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:27 wiz Exp $ DISTNAME= cairomm-1.8.4 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ diff --git a/graphics/cairomm/buildlink3.mk b/graphics/cairomm/buildlink3.mk index f6367959c8f..046f4fe20d1 100644 --- a/graphics/cairomm/buildlink3.mk +++ b/graphics/cairomm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:44:27 wiz Exp $ BUILDLINK_TREE+= cairomm @@ -6,6 +6,7 @@ BUILDLINK_TREE+= cairomm CAIROMM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.cairomm+= cairomm>=1.2.2 +BUILDLINK_ABI_DEPENDS.cairomm?= cairomm>=1.8.4nb1 BUILDLINK_PKGSRCDIR.cairomm?= ../../graphics/cairomm .include "../../graphics/cairo/buildlink3.mk" diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile index 5502e021ef7..0ae5c4ff4b6 100644 --- a/graphics/camlimages/Makefile +++ b/graphics/camlimages/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2010/03/17 14:17:02 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:27 wiz Exp $ DISTNAME= camlimages-2.2.0 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= graphics MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/ EXTRACT_SUFX= .tgz diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile index 823125955ae..89dc9a98e89 100644 --- a/graphics/cheese/Makefile +++ b/graphics/cheese/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2009/08/26 19:57:36 sno Exp $ +# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:27 wiz Exp $ DISTNAME= cheese-2.26.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cheese/2.26/} diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile index 2bf955a2910..8860e7397b8 100644 --- a/graphics/cinepaint/Makefile +++ b/graphics/cinepaint/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2010/01/18 09:58:56 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:27 wiz Exp $ DISTNAME= cinepaint-0.22-1 PKGNAME= cinepaint-0.22.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cinepaint/} diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile index 1b58f7c6bec..a3aa49d7248 100644 --- a/graphics/clutter-box2d/Makefile +++ b/graphics/clutter-box2d/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2009/10/26 08:48:05 obache Exp $ +# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:27 wiz Exp $ # DISTNAME= clutter-box2d-0.10.0 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/clutter-box2d/0.10/ diff --git a/graphics/clutter-cairo/Makefile b/graphics/clutter-cairo/Makefile index f016b1745e0..9e17bbc8947 100644 --- a/graphics/clutter-cairo/Makefile +++ b/graphics/clutter-cairo/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2009/10/26 08:36:30 obache Exp $ +# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:27 wiz Exp $ # DISTNAME= clutter-cairo-0.8.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/clutter-cairo/0.8/ diff --git a/graphics/clutter-cairo/buildlink3.mk b/graphics/clutter-cairo/buildlink3.mk index a710ad4ef3f..ba91d7ad021 100644 --- a/graphics/clutter-cairo/buildlink3.mk +++ b/graphics/clutter-cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/10/26 08:36:30 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:27 wiz Exp $ # BUILDLINK_TREE+= clutter-cairo @@ -7,7 +7,7 @@ BUILDLINK_TREE+= clutter-cairo CLUTTER_CAIRO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.clutter-cairo+= clutter-cairo>=0.8.0 -BUILDLINK_ABI_DEPENDS.clutter-cairo+= clutter-cairo>=0.8.2nb2 +BUILDLINK_ABI_DEPENDS.clutter-cairo+= clutter-cairo>=0.8.2nb3 BUILDLINK_PKGSRCDIR.clutter-cairo?= ../../graphics/clutter-cairo .include "../../graphics/cairo/buildlink3.mk" diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile index 06c5931c1bc..6db8161ccc7 100644 --- a/graphics/clutter-gtk/Makefile +++ b/graphics/clutter-gtk/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2010/06/02 06:44:22 obache Exp $ +# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:27 wiz Exp $ # DISTNAME= clutter-gtk-0.10.4 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/clutter-gtk/0.10/ diff --git a/graphics/clutter-gtk/buildlink3.mk b/graphics/clutter-gtk/buildlink3.mk index dc4473f9a39..1aa5a739002 100644 --- a/graphics/clutter-gtk/buildlink3.mk +++ b/graphics/clutter-gtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/10/26 08:51:01 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:27 wiz Exp $ # BUILDLINK_TREE+= clutter-gtk @@ -7,6 +7,7 @@ BUILDLINK_TREE+= clutter-gtk CLUTTER_GTK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.clutter-gtk+= clutter-gtk>=0.10.0 +BUILDLINK_ABI_DEPENDS.clutter-gtk?= clutter-gtk>=0.10.4nb1 BUILDLINK_PKGSRCDIR.clutter-gtk?= ../../graphics/clutter-gtk .include "../../x11/gtk2/buildlink3.mk" diff --git a/graphics/clutter-qt/Makefile b/graphics/clutter-qt/Makefile index bc2f7adc6f0..fd82a9a0baf 100644 --- a/graphics/clutter-qt/Makefile +++ b/graphics/clutter-qt/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2010/02/07 12:29:18 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:27 wiz Exp $ # DISTNAME= clutter-qt-1.0.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/clutter-qt/1.0/ diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index 5e34c83f919..d72de720e33 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2010/05/16 17:06:49 zafer Exp $ +# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:27 wiz Exp $ # DISTNAME= clutter-1.2.8 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/clutter/1.2/ # ${MASTER_SITE_GNOME:=sources/clutter/1.2/} diff --git a/graphics/clutter/buildlink3.mk b/graphics/clutter/buildlink3.mk index 639286aeb7d..8e4f54b3bec 100644 --- a/graphics/clutter/buildlink3.mk +++ b/graphics/clutter/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2009/11/03 06:01:54 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:27 wiz Exp $ # BUILDLINK_TREE+= clutter @@ -7,6 +7,7 @@ BUILDLINK_TREE+= clutter CLUTTER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.clutter+= clutter>=1.0.0 +BUILDLINK_ABI_DEPENDS.clutter?= clutter>=1.2.8nb1 BUILDLINK_PKGSRCDIR.clutter?= ../../graphics/clutter pkgbase := clutter diff --git a/graphics/clutter08-gtk/Makefile b/graphics/clutter08-gtk/Makefile index d24099fad14..6d0a1c7b823 100644 --- a/graphics/clutter08-gtk/Makefile +++ b/graphics/clutter08-gtk/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/26 08:32:30 obache Exp $ +# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:28 wiz Exp $ # DISTNAME= clutter-gtk-0.8.3 PKGNAME= ${DISTNAME:S/clutter/clutter08/} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/clutter-gtk/0.8/ diff --git a/graphics/clutter08-gtk/buildlink3.mk b/graphics/clutter08-gtk/buildlink3.mk index 87b2427180e..c37867b772a 100644 --- a/graphics/clutter08-gtk/buildlink3.mk +++ b/graphics/clutter08-gtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/26 08:32:30 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:28 wiz Exp $ # BUILDLINK_TREE+= clutter08-gtk @@ -7,6 +7,7 @@ BUILDLINK_TREE+= clutter08-gtk CLUTTER08_GTK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.clutter08-gtk+= clutter08-gtk>=0.8.0 +BUILDLINK_ABI_DEPENDS.clutter08-gtk?= clutter08-gtk>=0.8.3nb1 BUILDLINK_PKGSRCDIR.clutter08-gtk?= ../../graphics/clutter08-gtk .include "../../x11/gtk2/buildlink3.mk" diff --git a/graphics/clutter08/Makefile b/graphics/clutter08/Makefile index 6488909c8b6..248d0e871f2 100644 --- a/graphics/clutter08/Makefile +++ b/graphics/clutter08/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2010/05/25 07:25:44 obache Exp $ +# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:28 wiz Exp $ # DISTNAME= clutter-0.8.8 PKGNAME= ${DISTNAME:S/clutter/clutter08/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/clutter/0.8/ diff --git a/graphics/clutter08/buildlink3.mk b/graphics/clutter08/buildlink3.mk index 885c67272f8..d388e249b42 100644 --- a/graphics/clutter08/buildlink3.mk +++ b/graphics/clutter08/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/26 08:30:16 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:28 wiz Exp $ # BUILDLINK_TREE+= clutter08 @@ -7,6 +7,7 @@ BUILDLINK_TREE+= clutter08 CLUTTER08_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.clutter08+= clutter08>=0.8.0 +BUILDLINK_ABI_DEPENDS.clutter08?= clutter08>=0.8.8nb2 BUILDLINK_PKGSRCDIR.clutter08?= ../../graphics/clutter08 pkgbase := clutter08 diff --git a/graphics/cnxtview/Makefile b/graphics/cnxtview/Makefile index 1631f47b18e..93dd68d3d9c 100644 --- a/graphics/cnxtview/Makefile +++ b/graphics/cnxtview/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2010/02/03 05:35:00 obache Exp $ +# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:28 wiz Exp $ # DISTNAME= cnxtutil-0.00-alpha PKGNAME= cnxtview-0.00a -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics x11 MASTER_SITES= http://home.384.jp/takam/bsd/ diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile index a10c4569a57..02f9e2a8d6d 100644 --- a/graphics/comix/Makefile +++ b/graphics/comix/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2010/02/10 19:17:39 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:28 wiz Exp $ # DISTNAME= comix-4.0.4 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=comix/} diff --git a/graphics/cpia2view/Makefile b/graphics/cpia2view/Makefile index 0ea9916525e..a955c512ada 100644 --- a/graphics/cpia2view/Makefile +++ b/graphics/cpia2view/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2010/02/01 02:57:04 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:28 wiz Exp $ # DISTNAME= cpia2_driver-1.0 PKGNAME= cpia2view-0.03 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cpia2/} EXTRACT_SUFX= .tgz diff --git a/graphics/denemo/Makefile b/graphics/denemo/Makefile index 2dbd2378949..89279095dba 100644 --- a/graphics/denemo/Makefile +++ b/graphics/denemo/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2009/08/26 19:57:37 sno Exp $ +# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:28 wiz Exp $ # DISTNAME= denemo-0.7.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=denemo/} diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile index 009404c4c2a..6489dac14a4 100644 --- a/graphics/dia-python/Makefile +++ b/graphics/dia-python/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2010/02/10 19:17:39 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:28 wiz Exp $ # -PKGREVISION= 1 +PKGREVISION= 2 DIA_SUBPKG= -python .include "../../graphics/dia/Makefile.common" diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index fe4815ed2c1..65aa9fa16a4 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.58 2010/01/27 19:38:51 drochner Exp $ +# $NetBSD: Makefile,v 1.59 2010/06/13 22:44:28 wiz Exp $ # .include "Makefile.common" +PKGREVISION= 1 .include "options.mk" diff --git a/graphics/digikam-doc-kde3/Makefile b/graphics/digikam-doc-kde3/Makefile index 32e9f617556..26df1006d17 100644 --- a/graphics/digikam-doc-kde3/Makefile +++ b/graphics/digikam-doc-kde3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2010/02/15 14:44:16 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:28 wiz Exp $ DISTNAME= digikam-doc-0.9.5 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/digikam-kde3/Makefile b/graphics/digikam-kde3/Makefile index 2275872be90..aaecbd6a764 100644 --- a/graphics/digikam-kde3/Makefile +++ b/graphics/digikam-kde3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2010/02/15 14:44:17 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:28 wiz Exp $ DISTNAME= digikam-0.9.6 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/digikam-kde3/distinfo b/graphics/digikam-kde3/distinfo index f80ed9d4ae0..ed47e7eb523 100644 --- a/graphics/digikam-kde3/distinfo +++ b/graphics/digikam-kde3/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/02/15 14:16:57 wiz Exp $ +$NetBSD: distinfo,v 1.2 2010/06/13 22:44:28 wiz Exp $ SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5 RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215 Size (digikam-0.9.6.tar.bz2) = 11517637 bytes +SHA1 (patch-aa) = 818a8ae95459dd8fb25ace8210af0a0576084aba +SHA1 (patch-ab) = 50636e14be0b183ac8ee2147a3b3a8227cef10d5 diff --git a/graphics/digikam-kde3/patches/patch-aa b/graphics/digikam-kde3/patches/patch-aa new file mode 100644 index 00000000000..bb9392364c6 --- /dev/null +++ b/graphics/digikam-kde3/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2010/06/13 22:44:29 wiz Exp $ + +--- digikam/libs/dimg/loaders/pngloader.cpp.orig 2009-07-03 05:19:41.000000000 +0000 ++++ digikam/libs/dimg/loaders/pngloader.cpp +@@ -252,7 +252,7 @@ bool PNGLoader::load(const QString& file + #ifdef ENABLE_DEBUG_MESSAGES + DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl; + #endif +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + png_set_gray_to_rgb(png_ptr); + + if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel diff --git a/graphics/digikam-kde3/patches/patch-ab b/graphics/digikam-kde3/patches/patch-ab new file mode 100644 index 00000000000..971ffc26741 --- /dev/null +++ b/graphics/digikam-kde3/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2010/06/13 22:44:29 wiz Exp $ + +--- digikam/kioslave/digikamthumbnail.cpp.orig 2009-07-03 05:19:41.000000000 +0000 ++++ digikam/kioslave/digikamthumbnail.cpp +@@ -465,7 +465,7 @@ QImage kio_digikamthumbnailProtocol::loa + { + png_set_gray_to_rgb(png_ptr); + if (png_get_bit_depth(png_ptr, info_ptr) < 8) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + int sizeOfUint = sizeof(unsigned int); diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 7fd395b85e1..f04707978ed 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.57 2010/05/09 21:11:52 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2010/06/13 22:44:28 wiz Exp $ # DISTNAME= digikam-1.2.0 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index 079d73c60b6..5f0943cd4fa 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:57 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:29 wiz Exp $ # DISTNAME= djview4-4.2-2 PKGNAME= djview4-4.2.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/} diff --git a/graphics/dvipng/Makefile b/graphics/dvipng/Makefile index 0b9d1c5bc83..14b977eec7a 100644 --- a/graphics/dvipng/Makefile +++ b/graphics/dvipng/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2010/05/17 20:21:38 tez Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:29 wiz Exp $ DISTNAME= dvipng-1.12 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvipng/} diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile index dc7e1f2b7c6..d7a4b8117a2 100644 --- a/graphics/dx/Makefile +++ b/graphics/dx/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2010/01/18 09:58:57 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2010/06/13 22:44:29 wiz Exp $ DISTNAME= dx-4.4.4 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://opendx.npaci.edu/source/ diff --git a/graphics/enblend-enfuse/Makefile b/graphics/enblend-enfuse/Makefile index b44502b1e32..205af569423 100644 --- a/graphics/enblend-enfuse/Makefile +++ b/graphics/enblend-enfuse/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2010/05/15 05:47:58 adam Exp $ +# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:29 wiz Exp $ DISTNAME= enblend-enfuse-4.0 # XXX distribution file has changed; remove the line below on next update DIST_SUBDIR= ${PKGNAME_NOREV} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enblend/} diff --git a/graphics/enblend-enfuse/distinfo b/graphics/enblend-enfuse/distinfo index 66abf0ce382..1f1573ba501 100644 --- a/graphics/enblend-enfuse/distinfo +++ b/graphics/enblend-enfuse/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2010/05/15 05:47:58 adam Exp $ +$NetBSD: distinfo,v 1.5 2010/06/13 22:44:29 wiz Exp $ SHA1 (enblend-enfuse-4.0/enblend-enfuse-4.0.tar.gz) = 34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033 RMD160 (enblend-enfuse-4.0/enblend-enfuse-4.0.tar.gz) = 9e531b5bf6f7258ef8778c01b456979e0bc04338 @@ -7,3 +7,4 @@ SHA1 (patch-aa) = b1809fe6ef6609658b697635c6cbf0c112a03fd1 SHA1 (patch-ab) = afc074bb94e2a2b96c654c37540072514ba0bce0 SHA1 (patch-ac) = 916f4655ff30013583014eb8deecc72bd19ae55d SHA1 (patch-ad) = bc0a04dbf7477c3db7c9ef979fb851a975a93571 +SHA1 (patch-ae) = d16fc0157c9796bfc63bc434cc627dcf99669d6f diff --git a/graphics/enblend-enfuse/patches/patch-ae b/graphics/enblend-enfuse/patches/patch-ae new file mode 100644 index 00000000000..c083c9fd80d --- /dev/null +++ b/graphics/enblend-enfuse/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1 2010/06/13 22:44:29 wiz Exp $ + +--- src/vigra_impex/png.cxx.orig 2009-12-20 15:32:28.000000000 +0000 ++++ src/vigra_impex/png.cxx +@@ -274,8 +274,8 @@ namespace vigra { + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { + if (setjmp(png->jmpbuf)) +- 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); ++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); ++ png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; + } + diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 296a14b972f..2952f42d9a6 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.54 2010/01/18 09:58:58 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:29 wiz Exp $ # DISTNAME= eog-2.28.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eog/2.28/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/evas-png/Makefile b/graphics/evas-png/Makefile index 6d2a5fa603d..d2bfdc6d920 100644 --- a/graphics/evas-png/Makefile +++ b/graphics/evas-png/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:58 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:29 wiz Exp $ PKGNAME= ${DISTNAME:S/evas/evas-png/} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= Evas PNG image loader diff --git a/graphics/evas-svg/Makefile b/graphics/evas-svg/Makefile index bc79351334e..a6e3453862b 100644 --- a/graphics/evas-svg/Makefile +++ b/graphics/evas-svg/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:59 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:29 wiz Exp $ PKGNAME= ${DISTNAME:S/evas/evas-svg/} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= Evas SVG image loader diff --git a/graphics/extrema/Makefile b/graphics/extrema/Makefile index ec9d67a3157..c518ed5ee45 100644 --- a/graphics/extrema/Makefile +++ b/graphics/extrema/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2010/02/11 18:28:07 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:29 wiz Exp $ # DISTNAME= extrema-4.4.3 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=extrema/} diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile index 829b746d9c5..28e0f5a8762 100644 --- a/graphics/f-spot/Makefile +++ b/graphics/f-spot/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2010/05/17 17:46:44 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:30 wiz Exp $ # DISTNAME= f-spot-0.6.2 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/f-spot/0.6/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/f4l/Makefile b/graphics/f4l/Makefile index 8de1b7fc3cf..3677f2d593a 100644 --- a/graphics/f4l/Makefile +++ b/graphics/f4l/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2010/01/18 09:58:59 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:30 wiz Exp $ DISTNAME= f4l-0.2.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=f4l/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index ce6aab5a156..6a557ce7823 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2010/01/18 09:58:59 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2010/06/13 22:44:30 wiz Exp $ # DISTNAME= feh-1.3.4 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://linuxbrit.co.uk/downloads/ diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile index 258104a55bc..3739b3757be 100644 --- a/graphics/flphoto/Makefile +++ b/graphics/flphoto/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2010/01/18 09:58:59 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:30 wiz Exp $ # DISTNAME= flphoto-1.2-source PKGNAME= flphoto-1.2 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fltk/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index 40eb27ccc35..6fcf116d69e 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2010/01/18 09:58:59 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:30 wiz Exp $ DISTNAME= fly-1.6.5 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= graphics www MASTER_SITES= ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/ diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index e069aa83dab..5300f3efb64 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2010/02/03 23:23:27 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:30 wiz Exp $ # DISTNAME= fnlib-0.5 -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= x11 graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} diff --git a/graphics/fnlib/buildlink3.mk b/graphics/fnlib/buildlink3.mk index 61e5d3cef87..644e0cad24a 100644 --- a/graphics/fnlib/buildlink3.mk +++ b/graphics/fnlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:58:59 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:30 wiz Exp $ BUILDLINK_TREE+= fnlib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= fnlib FNLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.fnlib+= fnlib>=0.5nb6 -BUILDLINK_ABI_DEPENDS.fnlib+= fnlib>=0.5nb12 +BUILDLINK_ABI_DEPENDS.fnlib+= fnlib>=0.5nb13 BUILDLINK_PKGSRCDIR.fnlib?= ../../graphics/fnlib .include "../../graphics/imlib/buildlink3.mk" diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index 64f71c63458..79372b419f5 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2010/02/03 23:21:36 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:30 wiz Exp $ # DISTNAME= fotoxx-5.8 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/ diff --git a/graphics/frameworks/Makefile b/graphics/frameworks/Makefile index 63d2afed85f..9bcb79cb413 100644 --- a/graphics/frameworks/Makefile +++ b/graphics/frameworks/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:40 sno Exp $ +# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:30 wiz Exp $ # DISTNAME= frameworks-0.3.7 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://frameworks.polycrystal.org/release/ SITES.frameworks.png= http://frameworks.polycrystal.org/images/ diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile index 923758a9fb8..69bb3f823b7 100644 --- a/graphics/g2/Makefile +++ b/graphics/g2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2010/02/03 23:21:08 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:30 wiz Exp $ DISTNAME= g2-0.50 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://g2.sourceforge.net/pub/ diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 04e48a981c5..ef00353e99b 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.82 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.83 2010/06/13 22:44:30 wiz Exp $ DISTNAME= gd-2.0.35 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.libgd.org/releases/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk index 6e412237bb5..173230f74db 100644 --- a/graphics/gd/buildlink3.mk +++ b/graphics/gd/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:30 wiz Exp $ BUILDLINK_TREE+= gd @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gd GD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gd+= gd>=2.0.15nb1 -BUILDLINK_ABI_DEPENDS.gd+= gd>=2.0.35nb4 +BUILDLINK_ABI_DEPENDS.gd+= gd>=2.0.35nb5 BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd pkgbase := gd diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile index 10b487e38dc..fd357e84845 100644 --- a/graphics/gdchart/Makefile +++ b/graphics/gdchart/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:31 wiz Exp $ DISTNAME= gdchart0.11.5dev PKGNAME= gdchart-0.11.5 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.fred.net/brv/chart/ diff --git a/graphics/gdchart/buildlink3.mk b/graphics/gdchart/buildlink3.mk index afc2b177579..4a84ec3b3a1 100644 --- a/graphics/gdchart/buildlink3.mk +++ b/graphics/gdchart/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:31 wiz Exp $ BUILDLINK_TREE+= gdchart @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gdchart GDCHART_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gdchart+= gdchart>=0.11.4nb1 -BUILDLINK_ABI_DEPENDS.gdchart+= gdchart>=0.11.5nb4 +BUILDLINK_ABI_DEPENDS.gdchart+= gdchart>=0.11.5nb5 BUILDLINK_PKGSRCDIR.gdchart?= ../../graphics/gdchart .include "../../graphics/gd/buildlink3.mk" diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index 5e472b2f237..487e3d24d9a 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.39 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:31 wiz Exp $ # PKG_DESTDIR_SUPPORT= user-destdir .include "Makefile.common" -PKGREVISION= 11 +PKGREVISION= 12 COMMENT= The GNOME image loading library # XXX hopefully there is no x.gnome-config.x in PATH diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk index a48b7c2fa9e..29d715a6abb 100644 --- a/graphics/gdk-pixbuf/buildlink3.mk +++ b/graphics/gdk-pixbuf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:31 wiz Exp $ BUILDLINK_TREE+= gdk-pixbuf @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gdk-pixbuf GDK_PIXBUF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2 -BUILDLINK_ABI_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb11 +BUILDLINK_ABI_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb12 BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf BUILDLINK_CPPFLAGS.gdk-pixbuf+= \ -I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0 diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index d867a3675a4..578cd30d477 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2010/02/25 14:13:54 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:31 wiz Exp $ # DISTNAME= geeqie-1.0 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=geeqie/} diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index fa5f72ba167..1825b31d2b0 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2010/02/04 12:28:43 adam Exp $ +# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:31 wiz Exp $ DISTNAME= gegl-0.1.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/gegl/0.1/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/gegl/buildlink3.mk b/graphics/gegl/buildlink3.mk index 465402e6975..3fc7647e45c 100644 --- a/graphics/gegl/buildlink3.mk +++ b/graphics/gegl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2010/02/04 12:28:43 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:31 wiz Exp $ BUILDLINK_TREE+= gegl @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gegl GEGL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gegl+= gegl>=0.0.20 -BUILDLINK_ABI_DEPENDS.gegl+= gegl>=0.1.0nb3 +BUILDLINK_ABI_DEPENDS.gegl+= gegl>=0.1.0nb4 BUILDLINK_PKGSRCDIR.gegl?= ../../graphics/gegl pkgbase := gegl diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile index 369b7d565ef..14fb135c5cc 100644 --- a/graphics/gfract/Makefile +++ b/graphics/gfract/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2009/08/26 19:57:41 sno Exp $ +# $NetBSD: Makefile,v 1.36 2010/06/13 22:44:31 wiz Exp $ # DISTNAME= gfract-0.32 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics x11 MASTER_SITES= http://www.oskusoft.com/osku/gfract/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gfract-palettes-0.1.tar.gz diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile index a8e417bc6ec..15e34398d5c 100644 --- a/graphics/gif2png/Makefile +++ b/graphics/gif2png/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2010/02/10 19:17:39 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:31 wiz Exp $ DISTNAME= gif2png-2.5.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics converters MASTER_SITES= http://www.catb.org/~esr/gif2png/ diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index 48b06768fdd..8d0fca600a7 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.60 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2010/06/13 22:44:31 wiz Exp $ DISTNAME= gimageview-0.2.27 -PKGREVISION= 17 +PKGREVISION= 18 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/} diff --git a/graphics/gimmage/Makefile b/graphics/gimmage/Makefile index b66d929b30e..0bc8030cfab 100644 --- a/graphics/gimmage/Makefile +++ b/graphics/gimmage/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2010/01/17 12:02:20 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:32 wiz Exp $ # DISTNAME= gimmage-0.2.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://download.berlios.de/gimmage/ diff --git a/graphics/gimp-color-manager/Makefile b/graphics/gimp-color-manager/Makefile index c20f6e8e423..4c7090d0158 100644 --- a/graphics/gimp-color-manager/Makefile +++ b/graphics/gimp-color-manager/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:32 wiz Exp $ # DISTNAME= gimp-color-manager-0.1.0 -PKGREVISION= 16 +PKGREVISION= 17 CATEGORIES= graphics MASTER_SITES= ftp://www.virtual-sub.org/ diff --git a/graphics/gimp-exif-browser/Makefile b/graphics/gimp-exif-browser/Makefile index cf358a3626e..2ecff76e792 100644 --- a/graphics/gimp-exif-browser/Makefile +++ b/graphics/gimp-exif-browser/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:32 wiz Exp $ # DISTNAME= exif-browser PKGNAME= gimp-exif-browser-0.1.0 DIST_SUBDIR= gimp-exif-browser-0.1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://registry.gimp.org/files/ diff --git a/graphics/gimp-fix-ca/Makefile b/graphics/gimp-fix-ca/Makefile index a7198a6b89c..7f322be6cd5 100644 --- a/graphics/gimp-fix-ca/Makefile +++ b/graphics/gimp-fix-ca/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:32 wiz Exp $ # DISTNAME= gimp-fix-ca-3.0.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://registry.gimp.org/file/fix-ca.c?action=download&id=9884&file= EXTRACT_SUFX= .c diff --git a/graphics/gimp-liquid-rescale/Makefile b/graphics/gimp-liquid-rescale/Makefile index 433c4ac10a4..e6867aa6535 100644 --- a/graphics/gimp-liquid-rescale/Makefile +++ b/graphics/gimp-liquid-rescale/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:32 wiz Exp $ # DISTNAME= gimp-lqr-plugin-0.6.1 PKGNAME= gimp-liquid-rescale-0.6.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://liquidrescale.wikidot.com/local--files/en:download-page/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/gimp-rawphoto/Makefile b/graphics/gimp-rawphoto/Makefile index 11620174667..1d11e0240f1 100644 --- a/graphics/gimp-rawphoto/Makefile +++ b/graphics/gimp-rawphoto/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2010/06/13 22:44:32 wiz Exp $ # DISTNAME= rawphoto-200410220928 PKGNAME= gimp-rawphoto-1.19 -PKGREVISION= 16 +PKGREVISION= 17 CATEGORIES= graphics MASTER_SITES= # EXTRACT_SUFX= .tgz diff --git a/graphics/gimp-refocus-it/Makefile b/graphics/gimp-refocus-it/Makefile index 3d78c3b6cd0..c8a73cac41a 100644 --- a/graphics/gimp-refocus-it/Makefile +++ b/graphics/gimp-refocus-it/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:32 wiz Exp $ # DISTNAME= refocus-it-2.0.0 PKGNAME= gimp-refocus-it-2.0.0 -PKGREVISION= 16 +PKGREVISION= 17 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=refocus-it/} diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile index 62d4edab028..6dfcfcbfc05 100644 --- a/graphics/gimp-resynthesizer/Makefile +++ b/graphics/gimp-resynthesizer/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2010/04/20 22:27:56 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:32 wiz Exp $ # DISTNAME= resynthesizer-0.16 PKGNAME= gimp-${DISTNAME} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.logarithmic.net/pfh-files/resynthesizer/ diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile index 8e721570da7..72ce61a9a0c 100644 --- a/graphics/gimp-ufraw/Makefile +++ b/graphics/gimp-ufraw/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.57 2010/01/18 09:59:01 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2010/06/13 22:44:32 wiz Exp $ DISTNAME= ufraw-0.16 PKGNAME= gimp-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufraw/} diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index f5fb6189bd3..829c0f01ce6 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.190 2010/04/09 15:45:09 wiz Exp $ +# $NetBSD: Makefile,v 1.191 2010/06/13 22:44:32 wiz Exp $ DISTNAME= gimp-2.6.8 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v2.6/ \ ${MASTER_SITE_GNU:=gimp/v2.6/} \ diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk index d6bd8d80bce..adde132683f 100644 --- a/graphics/gimp/buildlink3.mk +++ b/graphics/gimp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2010/01/18 09:59:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2010/06/13 22:44:32 wiz Exp $ BUILDLINK_TREE+= gimp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gimp GIMP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gimp+= gimp>=2.4.0 -BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.6.8nb1 +BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.6.8nb3 BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp pkgbase := gimp diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo index ec3e2e79155..3e0e62da21e 100644 --- a/graphics/gimp/distinfo +++ b/graphics/gimp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.51 2009/12/16 19:16:49 drochner Exp $ +$NetBSD: distinfo,v 1.52 2010/06/13 22:44:32 wiz Exp $ SHA1 (gimp-2.6.8.tar.bz2) = a550943f086abc9bf6b96d576741337b7186a4f4 RMD160 (gimp-2.6.8.tar.bz2) = da02fedcc00ebaac04bfd21c153a7130d3ff5e08 @@ -6,3 +6,4 @@ Size (gimp-2.6.8.tar.bz2) = 16342377 bytes SHA1 (patch-aa) = 52d9b1995e47b3ae34510fef074c7000f2527adb SHA1 (patch-ab) = 4f5ba210bc69db55f79b67f0238aafc13992c050 SHA1 (patch-ac) = b1f4b802eebbb2d2145e0e282e65d48a0409a6b8 +SHA1 (patch-ad) = c17936829fb90c6cf726caf10ac8d42c146ef0a7 diff --git a/graphics/gimp/patches/patch-ad b/graphics/gimp/patches/patch-ad new file mode 100644 index 00000000000..31ba313b740 --- /dev/null +++ b/graphics/gimp/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.8 2010/06/13 22:44:32 wiz Exp $ + +--- plug-ins/file-ico/ico-load.c.orig 2009-07-20 20:20:51.000000000 +0000 ++++ plug-ins/file-ico/ico-load.c +@@ -287,14 +287,14 @@ ico_read_png (FILE *fp, + switch (color_type) + { + case PNG_COLOR_TYPE_GRAY: +- png_set_gray_1_2_4_to_8 (png_ptr); ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); + png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER); + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: +- png_set_gray_1_2_4_to_8 (png_ptr); ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile index 884b781a778..9da5d2a224a 100644 --- a/graphics/gimp1-base/Makefile +++ b/graphics/gimp1-base/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:01 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:33 wiz Exp $ # DISTNAME= gimp-1.2.5 PKGNAME= gimp-base-1.2.5 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.5/ \ ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.5/ diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk index 005448cd0b9..06b819df115 100644 --- a/graphics/gimp1-base/buildlink3.mk +++ b/graphics/gimp1-base/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:01 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:33 wiz Exp $ BUILDLINK_TREE+= gimp-base @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gimp-base GIMP_BASE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gimp-base+= gimp-base>=1.2.5nb2 -BUILDLINK_ABI_DEPENDS.gimp-base+= gimp-base>=1.2.5nb9 +BUILDLINK_ABI_DEPENDS.gimp-base+= gimp-base>=1.2.5nb10 BUILDLINK_PKGSRCDIR.gimp-base?= ../../graphics/gimp1-base .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/graphics/gimp1-data/Makefile b/graphics/gimp1-data/Makefile index ea08843ca68..887bcbe0826 100644 --- a/graphics/gimp1-data/Makefile +++ b/graphics/gimp1-data/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:01 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:33 wiz Exp $ # DISTNAME= gimp-data-extras-1.2.0 PKGNAME= gimp-data-1.2 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.5/ \ ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.5/ diff --git a/graphics/gimp1-wideangle/Makefile b/graphics/gimp1-wideangle/Makefile index bbda73bbf37..d31e0e04569 100644 --- a/graphics/gimp1-wideangle/Makefile +++ b/graphics/gimp1-wideangle/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2010/02/03 23:11:15 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:33 wiz Exp $ # DISTNAME= wideangleFeb03 PKGNAME= gimp-wideangle-0.4 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://members.ozemail.com.au/~hodsond/ EXTRACT_SUFX= .tgz diff --git a/graphics/gimp2-wideangle/Makefile b/graphics/gimp2-wideangle/Makefile index f574019385b..8298686957c 100644 --- a/graphics/gimp2-wideangle/Makefile +++ b/graphics/gimp2-wideangle/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.26 2010/02/03 23:19:10 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:33 wiz Exp $ # DISTNAME= wideangle PKGNAME= gimp2-wideangle-1.0 -PKGREVISION= 16 +PKGREVISION= 17 CATEGORIES= graphics MASTER_SITES= http://members.ozemail.com.au/~hodsond/ EXTRACT_SUFX= .c diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 14c36e0d461..7a119be229a 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.54 2009/08/26 19:57:42 sno Exp $ +# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:33 wiz Exp $ # DISTNAME= giram-0.3.5 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://www.giram.org/downloads/ diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile index 4c6a3c4d08b..55d19ad9b38 100644 --- a/graphics/gliv/Makefile +++ b/graphics/gliv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2009/08/26 19:57:42 sno Exp $ +# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:33 wiz Exp $ DISTNAME= gliv-1.9.6 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://guichaz.free.fr/gliv/files/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/glpng/Makefile b/graphics/glpng/Makefile index a0ab72bfbd3..b7e0380fc9c 100644 --- a/graphics/glpng/Makefile +++ b/graphics/glpng/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/09/01 21:07:37 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:33 wiz Exp $ # DISTNAME= glpng-1.45.20081203 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= # diff --git a/graphics/glpng/buildlink3.mk b/graphics/glpng/buildlink3.mk index 4e4d16cd5cc..2532ac3e5a7 100644 --- a/graphics/glpng/buildlink3.mk +++ b/graphics/glpng/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/09/01 21:07:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:33 wiz Exp $ BUILDLINK_TREE+= glpng @@ -6,6 +6,7 @@ BUILDLINK_TREE+= glpng GLPNG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.glpng+= glpng>=1.45.20081203 +BUILDLINK_ABI_DEPENDS.glpng?= glpng>=1.45.20081203nb1 BUILDLINK_PKGSRCDIR.glpng?= ../../graphics/glpng .include "../../devel/zlib/buildlink3.mk" diff --git a/graphics/gmngview/Makefile b/graphics/gmngview/Makefile index 94b0633d8e5..9539f1e4100 100644 --- a/graphics/gmngview/Makefile +++ b/graphics/gmngview/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:01 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:33 wiz Exp $ # DISTNAME= libmng-1.0.10 PKGNAME= ${DISTNAME:S/libmng/gmngview/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libmng/} diff --git a/graphics/gnuplot-nox11/Makefile b/graphics/gnuplot-nox11/Makefile index cbd39303700..f7032c7d006 100644 --- a/graphics/gnuplot-nox11/Makefile +++ b/graphics/gnuplot-nox11/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2010/01/24 13:26:10 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:33 wiz Exp $ # PKGNAME= ${DISTNAME:C/-/-nox11-/} -PKGREVISION= 2 +PKGREVISION= 3 CONFLICTS+= gnuplot-[0-9]* diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile index 04755852da1..4729f6f38ea 100644 --- a/graphics/gnuplot/Makefile +++ b/graphics/gnuplot/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2010/02/19 14:09:58 asau Exp $ +# $NetBSD: Makefile,v 1.50 2010/06/13 22:44:33 wiz Exp $ CATEGORIES+= x11 -PKGREVISION= 1 +PKGREVISION= 2 CONFLICTS+= gnuplot-nox11-[0-9]* diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile index add21966591..8da572da585 100644 --- a/graphics/gocr/Makefile +++ b/graphics/gocr/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:01 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:33 wiz Exp $ DISTNAME= gocr-0.47 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=jocr/} diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile index ba806238d34..ad614df9ee0 100644 --- a/graphics/goocanvas/Makefile +++ b/graphics/goocanvas/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:01 sno Exp $ +# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:33 wiz Exp $ # DISTNAME= goocanvas-0.15 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goocanvas/0.15/} diff --git a/graphics/goocanvas/buildlink3.mk b/graphics/goocanvas/buildlink3.mk index 46b93041d34..d9c39f903b4 100644 --- a/graphics/goocanvas/buildlink3.mk +++ b/graphics/goocanvas/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:01 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:34 wiz Exp $ # BUILDLINK_TREE+= goocanvas @@ -7,7 +7,7 @@ BUILDLINK_TREE+= goocanvas GOOCANVAS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.goocanvas+= goocanvas>=0.12 -BUILDLINK_ABI_DEPENDS.goocanvas?= goocanvas>=0.15nb1 +BUILDLINK_ABI_DEPENDS.goocanvas?= goocanvas>=0.15nb2 BUILDLINK_PKGSRCDIR.goocanvas?= ../../graphics/goocanvas .include "../../devel/glib2/buildlink3.mk" diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile index 1880f6f9f6f..ef8bb2a2134 100644 --- a/graphics/goocanvasmm/Makefile +++ b/graphics/goocanvasmm/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2010/03/29 06:00:12 obache Exp $ +# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:34 wiz Exp $ # DISTNAME= goocanvasmm-0.15.1 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goocanvasmm/0.15/} diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile index abce69cfb5b..a170bd228c7 100644 --- a/graphics/gphoto/Makefile +++ b/graphics/gphoto/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2010/01/18 09:59:01 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:34 wiz Exp $ DISTNAME= gphoto-0.4.3 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= graphics #MASTER_SITES= http://www.gphoto.net/dist/ diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile index 6ea886c2a72..9d10d4cf781 100644 --- a/graphics/gqview-devel/Makefile +++ b/graphics/gqview-devel/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2009/11/26 17:34:54 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:34 wiz Exp $ DISTNAME= gqview-2.1.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/} diff --git a/graphics/gqview-gtk1/Makefile b/graphics/gqview-gtk1/Makefile index 683936ec006..9ab9abc6bbe 100644 --- a/graphics/gqview-gtk1/Makefile +++ b/graphics/gqview-gtk1/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:01 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:34 wiz Exp $ DISTNAME= gqview-1.2.2 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/} diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index a26592e59e5..41f1d77129f 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.70 2009/12/07 00:02:25 wiz Exp $ +# $NetBSD: Makefile,v 1.71 2010/06/13 22:44:34 wiz Exp $ DISTNAME= gqview-2.0.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/} diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 662b5d76818..16c33f123e2 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.80 2010/03/24 19:43:24 asau Exp $ +# $NetBSD: Makefile,v 1.81 2010/06/13 22:44:34 wiz Exp $ DISTNAME= graphviz-2.24.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/ diff --git a/graphics/gst-plugins0.10-cairo/Makefile b/graphics/gst-plugins0.10-cairo/Makefile index 5e4b7171183..af428b05e37 100644 --- a/graphics/gst-plugins0.10-cairo/Makefile +++ b/graphics/gst-plugins0.10-cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:22 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:34 wiz Exp $ # GST_PLUGINS0.10_NAME= cairo @@ -9,5 +9,7 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../multimedia/gst-plugins0.10-good/Makefile.common" +PKGREVISION= 1 + .include "../../graphics/cairo/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gst-plugins0.10-png/Makefile b/graphics/gst-plugins0.10-png/Makefile index 2bbdbaedb9f..11ec16922bf 100644 --- a/graphics/gst-plugins0.10-png/Makefile +++ b/graphics/gst-plugins0.10-png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2009/09/08 20:28:54 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:34 wiz Exp $ # GST_PLUGINS0.10_NAME= png @@ -9,5 +9,7 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../multimedia/gst-plugins0.10-good/Makefile.common" +PKGREVISION= 1 + .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index 58e2233e4e7..b87cdebeff1 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.50 2010/05/17 16:56:27 drochner Exp $ +# $NetBSD: Makefile,v 1.51 2010/06/13 22:44:34 wiz Exp $ DISTNAME= gthumb-2.10.12 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gthumb/2.10/} diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index 3f4ef330a38..0cffe896be9 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2009/12/15 21:48:01 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2010/06/13 22:44:34 wiz Exp $ # DISTNAME= gtkam-0.1.16 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/} diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index 057d103bd4b..b2b6e303b3f 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2010/06/05 12:08:46 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:34 wiz Exp $ DISTNAME= gtkglext-1.2.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkglext/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk index 9fd008a1688..a3b39e217be 100644 --- a/graphics/gtkglext/buildlink3.mk +++ b/graphics/gtkglext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:56 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:34 wiz Exp $ BUILDLINK_TREE+= gtkglext @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtkglext GTKGLEXT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0 -BUILDLINK_ABI_DEPENDS.gtkglext?= gtkglext>=1.2.0nb3 +BUILDLINK_ABI_DEPENDS.gtkglext?= gtkglext>=1.2.0nb5 BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext .include "../../graphics/glu/buildlink3.mk" diff --git a/graphics/gtkimageview/Makefile b/graphics/gtkimageview/Makefile index 86a5a75b0fa..02fe38d6dad 100644 --- a/graphics/gtkimageview/Makefile +++ b/graphics/gtkimageview/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2010/02/03 23:05:44 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:35 wiz Exp $ DISTNAME= gtkimageview-1.6.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://trac.bjourne.webfactional.com/chrome/common/releases/ diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile index 32d6b1e2adc..7ab93f66b96 100644 --- a/graphics/gtksee/Makefile +++ b/graphics/gtksee/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2010/02/03 23:03:26 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:35 wiz Exp $ # DISTNAME= gtksee-0.5.6 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics x11 MASTER_SITES= http://download.berlios.de/gtksee/ diff --git a/graphics/guile-cairo/Makefile b/graphics/guile-cairo/Makefile index 33ebcd7c4c2..6f6fbfdbb04 100644 --- a/graphics/guile-cairo/Makefile +++ b/graphics/guile-cairo/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2010/03/24 19:43:24 asau Exp $ +# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:35 wiz Exp $ # DISTNAME= guile-cairo-1.4.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://download.gna.org/guile-cairo/ diff --git a/graphics/gwenview-i18n/Makefile b/graphics/gwenview-i18n/Makefile index 88f95985f2d..d88849ffea3 100644 --- a/graphics/gwenview-i18n/Makefile +++ b/graphics/gwenview-i18n/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:02 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:35 wiz Exp $ # DISTNAME= gwenview-i18n-1.4.2 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= kde graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwenview/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 69818c4f7f1..33e1a821e3c 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2010/06/10 20:08:50 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:35 wiz Exp $ # DISTNAME= gwenview-1.4.2 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= kde graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwenview/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/gwenview/distinfo b/graphics/gwenview/distinfo index b2bc387e976..d6086f08d55 100644 --- a/graphics/gwenview/distinfo +++ b/graphics/gwenview/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.15 2009/03/22 20:03:18 markd Exp $ +$NetBSD: distinfo,v 1.16 2010/06/13 22:44:35 wiz Exp $ SHA1 (gwenview-1.4.2.tar.bz2) = d2168b48eb7f27b4338681acc49b5b2a51268209 RMD160 (gwenview-1.4.2.tar.bz2) = 9c8bc84c90c2eda36f31fb6728990bc7e8063dd4 Size (gwenview-1.4.2.tar.bz2) = 984977 bytes SHA1 (patch-aa) = 03d6fd5756e9ea500a8885cbfd0a69ebfe1ff7b8 +SHA1 (patch-ab) = 394f01d4c16f281fe412090dbbc92887044fd3f1 diff --git a/graphics/gwenview/patches/patch-ab b/graphics/gwenview/patches/patch-ab new file mode 100644 index 00000000000..e50fa259915 --- /dev/null +++ b/graphics/gwenview/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.3 2010/06/13 22:44:35 wiz Exp $ + +--- src/gvcore/pngformattype.cpp.orig 2007-09-15 13:46:13.000000000 +0000 ++++ src/gvcore/pngformattype.cpp +@@ -245,7 +245,7 @@ void setup_qt( QImage& image, png_struct + image.setColor( i, qRgba(c,c,c,0xff) ); + } + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { +- const int g = info_ptr->trans_values.gray; ++ const int g = info_ptr->trans_color.gray; + if (g < ncols) { + image.setAlphaBuffer(TRUE); + image.setColor(g, image.color(g) & RGB_MASK); +@@ -273,7 +273,7 @@ void setup_qt( QImage& image, png_struct + info_ptr->palette[i].red, + info_ptr->palette[i].green, + info_ptr->palette[i].blue, +- info_ptr->trans[i] ++ info_ptr->trans_alpha[i] + ) + ); + i++; diff --git a/graphics/h5utils/Makefile b/graphics/h5utils/Makefile index 9f91a96b0d3..9c2302a0983 100644 --- a/graphics/h5utils/Makefile +++ b/graphics/h5utils/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2010/01/18 09:59:02 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:35 wiz Exp $ # DISTNAME= h5utils-1.12.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://ab-initio.mit.edu/h5utils/ diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile index bc12910c10a..ac1b5d3103b 100644 --- a/graphics/hp2xx/Makefile +++ b/graphics/hp2xx/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2010/02/03 22:59:13 joerg Exp $ +# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:35 wiz Exp $ # DISTNAME= hp2xx-3.4.4 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNU:=hp2xx/} diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 11ad1f16e02..f335a5547e7 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2010/05/15 07:26:22 adam Exp $ +# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:35 wiz Exp $ DISTNAME= hugin-2010.0.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/} diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo index 4b9f3a41b95..fe46a3dbca8 100644 --- a/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.4 2010/04/10 16:29:09 adam Exp $ +$NetBSD: distinfo,v 1.5 2010/06/13 22:44:35 wiz Exp $ SHA1 (hugin-2010.0.0.tar.gz) = 41eb7253aab12b913a5c9b6d9975d8652390dcb5 RMD160 (hugin-2010.0.0.tar.gz) = e2b03fe00a4a0242a1f3c4fd641cf8a3e312d516 Size (hugin-2010.0.0.tar.gz) = 12085453 bytes SHA1 (patch-aa) = 87336d2059b3fe50346c9a806e28a1b881de011e +SHA1 (patch-ab) = 3cf662d49f4cbfe742375d661653f25321d29aa1 SHA1 (patch-ac) = b091312601668e0504bca85da2ce808f7c447cd8 +SHA1 (patch-ad) = 64c30359067384fa058cb675dc1b08813bdc666c diff --git a/graphics/hugin/patches/patch-ab b/graphics/hugin/patches/patch-ab new file mode 100644 index 00000000000..259de989ffb --- /dev/null +++ b/graphics/hugin/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.4 2010/06/13 22:44:35 wiz Exp $ + +--- CMakeModules/FindPNG.cmake.orig 2010-03-02 23:17:21.000000000 +0000 ++++ CMakeModules/FindPNG.cmake +@@ -29,7 +29,7 @@ IF (ZLIB_FOUND) + + find_library_with_debug(PNG_LIBRARIES + WIN32_DEBUG_POSTFIX d +- NAMES png libpng wxpng ++ NAMES png14 libpng14 wxpng + PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR} + ) + diff --git a/graphics/hugin/patches/patch-ad b/graphics/hugin/patches/patch-ad new file mode 100644 index 00000000000..034225aa88b --- /dev/null +++ b/graphics/hugin/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:35 wiz Exp $ + +--- src/foreign/vigra/vigra_impex/png.cxx.orig 2010-03-02 23:17:21.000000000 +0000 ++++ src/foreign/vigra/vigra_impex/png.cxx +@@ -271,8 +271,8 @@ namespace vigra { + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { + if (setjmp(png->jmpbuf)) +- 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); ++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); ++ png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; + } + diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 99016402c58..8887096f90d 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.104 2010/01/18 09:59:02 wiz Exp $ +# $NetBSD: Makefile,v 1.105 2010/06/13 22:44:36 wiz Exp $ DISTNAME= imlib-1.9.15 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/imlib/1.9/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk index c741025e06a..90ea0abf7d1 100644 --- a/graphics/imlib/buildlink3.mk +++ b/graphics/imlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2010/01/18 09:59:02 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:36 wiz Exp $ BUILDLINK_TREE+= imlib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= imlib IMLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.imlib+= imlib>=1.9.14nb5 -BUILDLINK_ABI_DEPENDS.imlib+= imlib>=1.9.15nb6 +BUILDLINK_ABI_DEPENDS.imlib+= imlib>=1.9.15nb7 BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index de0e9d696fe..cc51f1fb175 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2010/01/18 09:59:02 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2010/06/13 22:44:36 wiz Exp $ DISTNAME= imlib2-1.4.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk index 447637c1845..27fb670655a 100644 --- a/graphics/imlib2/buildlink3.mk +++ b/graphics/imlib2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2010/06/08 15:13:01 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2010/06/13 22:44:36 wiz Exp $ BUILDLINK_TREE+= imlib2 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= imlib2 IMLIB2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.1.0nb2 -BUILDLINK_ABI_DEPENDS.imlib2+= imlib2>=1.4.2nb4 +BUILDLINK_ABI_DEPENDS.imlib2+= imlib2>=1.4.2nb5 BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2 .include "../../devel/zlib/buildlink3.mk" diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index dd0f3bdcb08..a9139c22cc0 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.48 2010/02/09 10:12:13 adam Exp $ +# $NetBSD: Makefile,v 1.49 2010/06/13 22:44:36 wiz Exp $ DISTNAME= inkscape-0.47 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile index c8bdb1f0650..98fc11f6a97 100644 --- a/graphics/kbarcode/Makefile +++ b/graphics/kbarcode/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2010/02/03 22:46:02 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:36 wiz Exp $ DISTNAME= kbarcode-2.0.7 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kbarcode/} diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index b868a7cd97c..c3fc2c72687 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.85 2010/01/18 09:59:03 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2010/06/13 22:44:36 wiz Exp $ DISTNAME= kdegraphics-${_KDE_VERSION} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics COMMENT= Graphics programs for the KDE integrated X11 desktop diff --git a/graphics/kdegraphics3/buildlink3.mk b/graphics/kdegraphics3/buildlink3.mk index 206502ce1b6..30af920bcbb 100644 --- a/graphics/kdegraphics3/buildlink3.mk +++ b/graphics/kdegraphics3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.22 2010/01/18 09:59:03 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2010/06/13 22:44:36 wiz Exp $ BUILDLINK_TREE+= kdegraphics @@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdegraphics KDEGRAPHICS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kdegraphics+= kdegraphics>=3.5.0nb2 -BUILDLINK_ABI_DEPENDS.kdegraphics?= kdegraphics>=3.5.10nb6 +BUILDLINK_ABI_DEPENDS.kdegraphics?= kdegraphics>=3.5.10nb7 BUILDLINK_PKGSRCDIR.kdegraphics?= ../../graphics/kdegraphics3 .include "../../converters/fribidi/buildlink3.mk" diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 6febaabe59c..e5cd2401cf7 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2010/01/27 10:38:39 markd Exp $ +# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:36 wiz Exp $ DISTNAME= kdegraphics-${_KDE_VERSION} +PKGREVISION= 1 CATEGORIES= graphics COMMENT= Graphical tools for the KDE desktop diff --git a/graphics/kdegraphics4/buildlink3.mk b/graphics/kdegraphics4/buildlink3.mk index ee17ca9884c..88073de8655 100644 --- a/graphics/kdegraphics4/buildlink3.mk +++ b/graphics/kdegraphics4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:03 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:36 wiz Exp $ BUILDLINK_TREE+= kdegraphics4 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdegraphics4 KDEGRAPHICS4_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kdegraphics4+= kdegraphics4>=4.1.1 -BUILDLINK_ABI_DEPENDS.kdegraphics4?= kdegraphics4>=4.3.4nb4 +BUILDLINK_ABI_DEPENDS.kdegraphics4?= kdegraphics4>=4.4.4nb1 BUILDLINK_PKGSRCDIR.kdegraphics4?= ../../graphics/kdegraphics4 .include "../../graphics/tiff/buildlink3.mk" diff --git a/graphics/kipi-plugins-calendar-kde3/Makefile b/graphics/kipi-plugins-calendar-kde3/Makefile index 4665e2f2f8b..19a82627894 100644 --- a/graphics/kipi-plugins-calendar-kde3/Makefile +++ b/graphics/kipi-plugins-calendar-kde3/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2010/02/15 14:45:17 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:36 wiz Exp $ DISTNAME= kipi-plugins-0.1.7 PKGNAME= kipi-plugins-calendar-0.1.7 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/kipi-plugins-kde3/Makefile b/graphics/kipi-plugins-kde3/Makefile index 1ae427eceb1..00280cc92fa 100644 --- a/graphics/kipi-plugins-kde3/Makefile +++ b/graphics/kipi-plugins-kde3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2010/02/15 14:45:17 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:36 wiz Exp $ DISTNAME= kipi-plugins-0.1.7 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile index 860565e85d4..521cf3ac3f1 100644 --- a/graphics/kipi-plugins/Makefile +++ b/graphics/kipi-plugins/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.50 2010/04/10 03:10:15 markd Exp $ +# $NetBSD: Makefile,v 1.51 2010/06/13 22:44:36 wiz Exp $ # DISTNAME= kipi-plugins-1.1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/kipi-plugins/1.1.0/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/koverartist/Makefile b/graphics/koverartist/Makefile index 6aaac7974a6..4b5a5df3a3f 100644 --- a/graphics/koverartist/Makefile +++ b/graphics/koverartist/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:03 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:36 wiz Exp $ DISTNAME= koverartist-0.5 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics kde MASTER_SITES= # empty EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index cb1ef9a68bd..7077066638c 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2010/02/03 22:53:39 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:37 wiz Exp $ # DISTNAME= kphotoalbum-3.1.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://ktown.kde.org/kphotoalbum/download/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/kphotobook/Makefile b/graphics/kphotobook/Makefile index 5e36fe6d253..f10dbab40f8 100644 --- a/graphics/kphotobook/Makefile +++ b/graphics/kphotobook/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2010/02/03 22:42:57 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:37 wiz Exp $ # DISTNAME= kphotobook-0.0.6 -PKGREVISION= 13 +PKGREVISION= 14 CATEGORIES= kde graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kphotobook/} diff --git a/graphics/kphotools/Makefile b/graphics/kphotools/Makefile index 208924fb9b4..8e50937aeba 100644 --- a/graphics/kphotools/Makefile +++ b/graphics/kphotools/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2010/02/03 22:40:00 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:37 wiz Exp $ # DISTNAME= kphotools-0.2.1 -PKGREVISION= 16 +PKGREVISION= 17 CATEGORIES= kde graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kphotools/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile index e7409a8e97d..830df775672 100644 --- a/graphics/lensfun/Makefile +++ b/graphics/lensfun/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2010/06/05 11:47:57 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:37 wiz Exp $ # DISTNAME= lensfun-0.2.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://download.berlios.de/lensfun/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile index 3c4413bf0c4..29c1eca0c97 100644 --- a/graphics/libexif-gtk/Makefile +++ b/graphics/libexif-gtk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2009/08/26 19:57:00 sno Exp $ +# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:37 wiz Exp $ DISTNAME= libexif-gtk-0.3.5 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libexif/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libexif-gtk/buildlink3.mk b/graphics/libexif-gtk/buildlink3.mk index 2c6d31899f7..ab5ccefe73d 100644 --- a/graphics/libexif-gtk/buildlink3.mk +++ b/graphics/libexif-gtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:57:00 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:37 wiz Exp $ # # This file was created automatically using createbuildlink-3.4. @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libexif-gtk LIBEXIF_GTK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.3nb7 -BUILDLINK_ABI_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.5nb5 +BUILDLINK_ABI_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.5nb6 BUILDLINK_PKGSRCDIR.libexif-gtk?= ../../graphics/libexif-gtk .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index 6e8c54d1b20..0b7648b4628 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2010/04/29 08:44:58 kefren Exp $ +# $NetBSD: Makefile,v 1.44 2010/06/13 22:44:37 wiz Exp $ DISTNAME= libgdiplus-2.6.4 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://ftp.novell.com/pub/mono/sources/libgdiplus/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk index d1c2d809ccd..07d7fb57b2d 100644 --- a/graphics/libgdiplus/buildlink3.mk +++ b/graphics/libgdiplus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2010/06/13 22:44:37 wiz Exp $ BUILDLINK_TREE+= libgdiplus @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgdiplus LIBGDIPLUS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libgdiplus+= libgdiplus>=2.0 -BUILDLINK_ABI_DEPENDS.libgdiplus?= libgdiplus>=2.4.2nb2 +BUILDLINK_ABI_DEPENDS.libgdiplus?= libgdiplus>=2.6.4nb1 BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus .include "../../devel/glib2/buildlink3.mk" diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 63c158aaa20..840caaea631 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2010/06/11 13:22:51 drochner Exp $ +# $NetBSD: Makefile,v 1.53 2010/06/13 22:44:37 wiz Exp $ # DISTNAME= libgnomecanvas-2.30.1 +PKGREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.30/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk index 9a628e28b4f..3ceb79a79b0 100644 --- a/graphics/libgnomecanvas/buildlink3.mk +++ b/graphics/libgnomecanvas/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:37 wiz Exp $ BUILDLINK_TREE+= libgnomecanvas @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnomecanvas LIBGNOMECANVAS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.8.0 -BUILDLINK_ABI_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.26.0nb1 +BUILDLINK_ABI_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.30.1nb1 BUILDLINK_PKGSRCDIR.libgnomecanvas?= ../../graphics/libgnomecanvas .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile index bae88db78c3..82455147218 100644 --- a/graphics/libgnomecanvasmm/Makefile +++ b/graphics/libgnomecanvasmm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:06 sno Exp $ +# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:37 wiz Exp $ DISTNAME= libgnomecanvasmm-2.26.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecanvasmm/2.26/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libgnomecanvasmm/buildlink3.mk b/graphics/libgnomecanvasmm/buildlink3.mk index cfa0a0ec715..b2cc2ebf324 100644 --- a/graphics/libgnomecanvasmm/buildlink3.mk +++ b/graphics/libgnomecanvasmm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:57:06 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:37 wiz Exp $ BUILDLINK_TREE+= libgnomecanvasmm @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnomecanvasmm LIBGNOMECANVASMM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.10.0 -BUILDLINK_ABI_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.26.0nb1 +BUILDLINK_ABI_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.26.0nb2 BUILDLINK_PKGSRCDIR.libgnomecanvasmm?= ../../graphics/libgnomecanvasmm .include "../../graphics/libgnomecanvas/buildlink3.mk" diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile index 1fb93252414..e7499f3d051 100644 --- a/graphics/libkdcraw/Makefile +++ b/graphics/libkdcraw/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:37 wiz Exp $ # DISTNAME= libkdcraw-0.1.9 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libkdcraw/buildlink3.mk b/graphics/libkdcraw/buildlink3.mk index 3fe6ecbfadb..62957cacdc6 100644 --- a/graphics/libkdcraw/buildlink3.mk +++ b/graphics/libkdcraw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2010/06/13 22:44:37 wiz Exp $ BUILDLINK_TREE+= libkdcraw @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkdcraw LIBKDCRAW_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libkdcraw+= libkdcraw>=0.1.1 -BUILDLINK_ABI_DEPENDS.libkdcraw?= libkdcraw>=0.1.9nb3 +BUILDLINK_ABI_DEPENDS.libkdcraw?= libkdcraw>=0.1.9nb4 BUILDLINK_PKGSRCDIR.libkdcraw?= ../../graphics/libkdcraw .include "../../x11/qt3-libs/buildlink3.mk" diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile index d2db121d48c..9c2a6533083 100644 --- a/graphics/libkexif/Makefile +++ b/graphics/libkexif/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:37 wiz Exp $ DISTNAME= libkexif-0.2.5 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libkexif/buildlink3.mk b/graphics/libkexif/buildlink3.mk index a4025bbc649..4b8868b93f5 100644 --- a/graphics/libkexif/buildlink3.mk +++ b/graphics/libkexif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:37 wiz Exp $ BUILDLINK_TREE+= libkexif @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkexif LIBKEXIF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libkexif+= libkexif>=0.2.5 -BUILDLINK_ABI_DEPENDS.libkexif?= libkexif>=0.2.5nb8 +BUILDLINK_ABI_DEPENDS.libkexif?= libkexif>=0.2.5nb9 BUILDLINK_PKGSRCDIR.libkexif?= ../../graphics/libkexif .include "../../graphics/libexif/buildlink3.mk" diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile index 51be65e4c03..765d07cd626 100644 --- a/graphics/libkexiv2/Makefile +++ b/graphics/libkexiv2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:38 wiz Exp $ # DISTNAME= libkexiv2-0.1.9 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libkexiv2/buildlink3.mk b/graphics/libkexiv2/buildlink3.mk index 6e3f384e4f1..05608337863 100644 --- a/graphics/libkexiv2/buildlink3.mk +++ b/graphics/libkexiv2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:44:38 wiz Exp $ BUILDLINK_TREE+= libkexiv2 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkexiv2 LIBKEXIV2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libkexiv2+= libkexiv2>=0.1.1 -BUILDLINK_ABI_DEPENDS.libkexiv2+= libkexiv2>=0.1.9nb2 +BUILDLINK_ABI_DEPENDS.libkexiv2+= libkexiv2>=0.1.9nb3 BUILDLINK_PKGSRCDIR.libkexiv2?= ../../graphics/libkexiv2 .include "../../graphics/exiv2/buildlink3.mk" diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile index 480d0c5952c..465642714d5 100644 --- a/graphics/libkipi/Makefile +++ b/graphics/libkipi/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2010/06/13 22:44:38 wiz Exp $ DISTNAME= libkipi-0.1.6 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libkipi/buildlink3.mk b/graphics/libkipi/buildlink3.mk index 0bfa6852659..54c11ae9771 100644 --- a/graphics/libkipi/buildlink3.mk +++ b/graphics/libkipi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:38 wiz Exp $ BUILDLINK_TREE+= libkipi @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkipi LIBKIPI_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libkipi+= libkipi>=0.1.5 -BUILDLINK_ABI_DEPENDS.libkipi?= libkipi>=0.1.6nb4 +BUILDLINK_ABI_DEPENDS.libkipi?= libkipi>=0.1.6nb5 BUILDLINK_PKGSRCDIR.libkipi?= ../../graphics/libkipi .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile index 377dad72119..b69b16eebf5 100644 --- a/graphics/libpano13/Makefile +++ b/graphics/libpano13/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:38 wiz Exp $ DISTNAME= libpano13-2.9.14 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=panotools/} diff --git a/graphics/libpano13/buildlink3.mk b/graphics/libpano13/buildlink3.mk index 712aef53998..4fc699e6601 100644 --- a/graphics/libpano13/buildlink3.mk +++ b/graphics/libpano13/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:38 wiz Exp $ BUILDLINK_TREE+= libpano13 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libpano13 LIBPANO13_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libpano13+= libpano13>=2.9.14 -BUILDLINK_ABI_DEPENDS.libpano13?= libpano13>=2.9.14nb2 +BUILDLINK_ABI_DEPENDS.libpano13?= libpano13>=2.9.14nb3 BUILDLINK_PKGSRCDIR.libpano13?= ../../graphics/libpano13 .include "../../graphics/jpeg/buildlink3.mk" diff --git a/graphics/libpuzzle/Makefile b/graphics/libpuzzle/Makefile index 09c4ab2e297..99dabd00af4 100644 --- a/graphics/libpuzzle/Makefile +++ b/graphics/libpuzzle/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:38 wiz Exp $ # DISTNAME= libpuzzle-0.11 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libpuzzle/buildlink3.mk b/graphics/libpuzzle/buildlink3.mk index f6a74ebb95e..074a4aae46a 100644 --- a/graphics/libpuzzle/buildlink3.mk +++ b/graphics/libpuzzle/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:38 wiz Exp $ BUILDLINK_TREE+= libpuzzle @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libpuzzle LIBPUZZLE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libpuzzle+= libpuzzle>=0.9 -BUILDLINK_ABI_DEPENDS.libpuzzle?= libpuzzle>=0.11nb2 +BUILDLINK_ABI_DEPENDS.libpuzzle?= libpuzzle>=0.11nb3 BUILDLINK_PKGSRCDIR.libpuzzle?= ../../graphics/libpuzzle .include "../../graphics/gd/buildlink3.mk" diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile index 67fa3fe5a31..69328740149 100644 --- a/graphics/librsvg/Makefile +++ b/graphics/librsvg/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2010/05/02 11:50:16 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:38 wiz Exp $ DISTNAME= librsvg-2.26.3 +PKGREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.26/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk index d33307dea40..90f6b1f121d 100644 --- a/graphics/librsvg/buildlink3.mk +++ b/graphics/librsvg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:56 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:38 wiz Exp $ BUILDLINK_TREE+= librsvg @@ -6,7 +6,7 @@ BUILDLINK_TREE+= librsvg LIBRSVG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6nb1 -BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.26.0 +BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.26.3nb1 BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg .include "../../devel/libgsf/buildlink3.mk" diff --git a/graphics/libscigraphica/Makefile b/graphics/libscigraphica/Makefile index f87ed538f5e..b26be9b2a26 100644 --- a/graphics/libscigraphica/Makefile +++ b/graphics/libscigraphica/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2010/05/29 13:54:32 drochner Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:38 wiz Exp $ # DISTNAME= libscigraphica-2.1.1 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scigraphica/} diff --git a/graphics/libscigraphica/buildlink3.mk b/graphics/libscigraphica/buildlink3.mk index f84885bf218..5636c3a6b7c 100644 --- a/graphics/libscigraphica/buildlink3.mk +++ b/graphics/libscigraphica/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2009/08/26 19:56:57 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:38 wiz Exp $ # BUILDLINK_TREE+= libscigraphica @@ -7,7 +7,7 @@ BUILDLINK_TREE+= libscigraphica LIBSCIGRAPHICA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libscigraphica+= libscigraphica>=2.1.1 -BUILDLINK_ABI_DEPENDS.libscigraphica?= libscigraphica>=2.1.1nb3 +BUILDLINK_ABI_DEPENDS.libscigraphica?= libscigraphica>=2.1.1nb6 BUILDLINK_PKGSRCDIR.libscigraphica?= ../../graphics/libscigraphica .include "../../graphics/libart/buildlink3.mk" diff --git a/graphics/libvideogfx/Makefile b/graphics/libvideogfx/Makefile index c4b1c5903c2..6ebf8220996 100644 --- a/graphics/libvideogfx/Makefile +++ b/graphics/libvideogfx/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:38 wiz Exp $ # DISTNAME= libvideogfx-1.0.3 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://rachmaninoff.informatik.uni-mannheim.de/libvideogfx/data/ diff --git a/graphics/libvideogfx/buildlink3.mk b/graphics/libvideogfx/buildlink3.mk index b0a58d23982..9bd9da0d8dd 100644 --- a/graphics/libvideogfx/buildlink3.mk +++ b/graphics/libvideogfx/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:38 wiz Exp $ BUILDLINK_TREE+= libvideogfx @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libvideogfx LIBVIDEOGFX_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libvideogfx+= libvideogfx>=1.0.3 -BUILDLINK_ABI_DEPENDS.libvideogfx+= libvideogfx>=1.0.3nb5 +BUILDLINK_ABI_DEPENDS.libvideogfx+= libvideogfx>=1.0.3nb6 BUILDLINK_PKGSRCDIR.libvideogfx?= ../../graphics/libvideogfx .include "../../graphics/jpeg/buildlink3.mk" diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 89386126d22..bd855882f75 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.64 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2010/06/13 22:44:38 wiz Exp $ DISTNAME= libwmf-0.2.8.4 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/} diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk index 4ed677ed706..3a75656c3dc 100644 --- a/graphics/libwmf/buildlink3.mk +++ b/graphics/libwmf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:38 wiz Exp $ BUILDLINK_TREE+= libwmf @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libwmf LIBWMF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8nb2 -BUILDLINK_ABI_DEPENDS.libwmf+= libwmf>=0.2.8.4nb6 +BUILDLINK_ABI_DEPENDS.libwmf+= libwmf>=0.2.8.4nb7 BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf .include "../../devel/zlib/buildlink3.mk" diff --git a/graphics/lprof/Makefile b/graphics/lprof/Makefile index dce70417d20..5995e044715 100644 --- a/graphics/lprof/Makefile +++ b/graphics/lprof/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:04 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:38 wiz Exp $ # DISTNAME= lprof-1.10.1 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lprof/} diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile index da17f9e7323..e31b81f436c 100644 --- a/graphics/magicpoint/Makefile +++ b/graphics/magicpoint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.65 2010/02/03 22:35:34 joerg Exp $ +# $NetBSD: Makefile,v 1.66 2010/06/13 22:44:38 wiz Exp $ DISTNAME= magicpoint-1.13a -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 graphics MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile index e3abfe2d726..950e9fbac4d 100644 --- a/graphics/mgl/Makefile +++ b/graphics/mgl/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.32 2010/02/22 11:39:10 obache Exp $ +# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:39 wiz Exp $ # DISTNAME= mgl2-alpha-020 PKGNAME= mgl-0.2.0a -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://at.sakura.ne.jp/~suz/arc/ diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 2e488a3fcb5..2d017eab5aa 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.165 2010/02/19 18:25:44 drochner Exp $ +# $NetBSD: Makefile,v 1.166 2010/06/13 22:44:39 wiz Exp $ DISTNAME= netpbm-10.35.73 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/} EXTRACT_SUFX= .tgz diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk index 8dd54927b9c..472c259b087 100644 --- a/graphics/netpbm/buildlink3.mk +++ b/graphics/netpbm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:39 wiz Exp $ BUILDLINK_TREE+= netpbm @@ -6,7 +6,7 @@ BUILDLINK_TREE+= netpbm NETPBM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.netpbm+= netpbm>=10.11.6 -BUILDLINK_ABI_DEPENDS.netpbm+= netpbm>=10.34nb4 +BUILDLINK_ABI_DEPENDS.netpbm+= netpbm>=10.35.73nb1 BUILDLINK_PKGSRCDIR.netpbm?= ../../graphics/netpbm .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index f90e3c6f74e..86be28b372c 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,12 +1,14 @@ -$NetBSD: distinfo,v 1.74 2010/03/28 12:36:35 drochner Exp $ +$NetBSD: distinfo,v 1.75 2010/06/13 22:44:39 wiz Exp $ SHA1 (netpbm-10.35.73.tgz) = e498fcedbc88c618e69163cdb9fa782178a1645e RMD160 (netpbm-10.35.73.tgz) = b4507ac7897227bf0fb8addceb9a14c9f4601ee8 Size (netpbm-10.35.73.tgz) = 2548185 bytes SHA1 (patch-aa) = fb94fb43c4c63113e9c720ea399a5cecb2c79977 SHA1 (patch-ab) = 7781c51e9a8cc9de953540a04e19303244ef8d57 +SHA1 (patch-ac) = d7e23b2b905c6f9c6114e17b16fcce3eadb29b56 SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1 +SHA1 (patch-af) = 7ac8b5a431cd007ccc23ea337194a5c542ff0a54 SHA1 (patch-ah) = f2a542983932edebee2110868e631b394f380b26 SHA1 (patch-ao) = b4307205f605d4c9c8f11c00e1a633960b33b2d3 SHA1 (patch-aw) = bd890324e95fa7bb893d9d5cdab9d5a33dcff777 diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac new file mode 100644 index 00000000000..1946546c99a --- /dev/null +++ b/graphics/netpbm/patches/patch-ac @@ -0,0 +1,49 @@ +$NetBSD: patch-ac,v 1.19 2010/06/13 22:44:39 wiz Exp $ + +--- converter/other/pnmtopng.c.orig 2009-09-03 15:34:36.000000000 +0000 ++++ converter/other/pnmtopng.c +@@ -69,11 +69,6 @@ + #include "nstring.h" + #include "version.h" + +-#if PNG_LIBPNG_VER >= 10400 +-#error Your PNG library () 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) +-#endif + + + struct zlibCompression { +@@ -2611,7 +2606,7 @@ convertpnm(struct cmdlineInfo const cmdl + info_ptr->num_palette = palette_size; + if (trans_size > 0) { + info_ptr->valid |= PNG_INFO_tRNS; +- info_ptr->trans = trans; ++ info_ptr->trans_alpha = trans; + info_ptr->num_trans = trans_size; /* omit opaque values */ + } + /* creating hIST chunk */ +@@ -2648,7 +2643,7 @@ convertpnm(struct cmdlineInfo const cmdl + info_ptr->color_type == PNG_COLOR_TYPE_RGB) { + if (transparent > 0) { + info_ptr->valid |= PNG_INFO_tRNS; +- info_ptr->trans_values = ++ info_ptr->trans_color = + xelToPngColor_16(transcolor, maxval, png_maxval); + } + } else { +@@ -2660,10 +2655,10 @@ convertpnm(struct cmdlineInfo const cmdl + if (info_ptr->valid && PNG_INFO_tRNS) + pm_message("Transparent color {gray, red, green, blue} = " + "{%d, %d, %d, %d}", +- info_ptr->trans_values.gray, +- info_ptr->trans_values.red, +- info_ptr->trans_values.green, +- info_ptr->trans_values.blue); ++ info_ptr->trans_color.gray, ++ info_ptr->trans_color.red, ++ info_ptr->trans_color.green, ++ info_ptr->trans_color.blue); + else + pm_message("No transparent color"); + } diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af new file mode 100644 index 00000000000..0e9969ce69a --- /dev/null +++ b/graphics/netpbm/patches/patch-af @@ -0,0 +1,64 @@ +$NetBSD: patch-af,v 1.14 2010/06/13 22:44:39 wiz Exp $ + +--- converter/other/pngtopnm.c.orig 2009-09-03 15:34:36.000000000 +0000 ++++ converter/other/pngtopnm.c +@@ -44,12 +44,6 @@ + #include "nstring.h" + #include "shhopt.h" + +-#if PNG_LIBPNG_VER >= 10400 +-#error Your PNG library () 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) +-#endif +- + typedef struct _jmpbuf_wrapper { + jmp_buf jmpbuf; + } jmpbuf_wrapper; +@@ -482,7 +476,7 @@ isTransparentColor(pngcolor const colo + bool retval; + + if (info_ptr->valid & PNG_INFO_tRNS) { +- const png_color_16 * const transColorP = &info_ptr->trans_values; ++ const png_color_16 * const transColorP = &info_ptr->trans_color; + + + /* There seems to be a problem here: you can't compare real +@@ -575,8 +569,8 @@ paletteHasPartialTransparency(png_info * + for (i = 0, foundGray = FALSE; + i < info_ptr->num_trans && !foundGray; + ++i) { +- if (info_ptr->trans[i] != 0 && +- info_ptr->trans[i] != maxval) { ++ if (info_ptr->trans_alpha[i] != 0 && ++ info_ptr->trans_alpha[i] != maxval) { + foundGray = TRUE; + } + } +@@ -647,7 +641,7 @@ setupSignificantBits(png_struct * + unsigned int i; + trans_mix = TRUE; + for (i = 0; i < info_ptr->num_trans; ++i) +- if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) { ++ if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) { + trans_mix = FALSE; + break; + } +@@ -885,7 +879,7 @@ writePnm(FILE * const ofP, + setXel(&xelrow[col], fgColor, bgColor, alpha_handling, + ((info_ptr->valid & PNG_INFO_tRNS) && + (fgColor.r == +- gamma_correct(info_ptr->trans_values.gray, ++ gamma_correct(info_ptr->trans_color.gray, + totalgamma))) ? + 0 : maxval); + } +@@ -914,7 +908,7 @@ writePnm(FILE * const ofP, + setXel(&xelrow[col], fgColor, bgColor, alpha_handling, + (info_ptr->valid & PNG_INFO_tRNS) && + index < info_ptr->num_trans ? +- info_ptr->trans[index] : maxval); ++ info_ptr->trans_alpha[index] : maxval); + } + break; + diff --git a/graphics/nvtv/Makefile b/graphics/nvtv/Makefile index 1479ee06050..0f813232cba 100644 --- a/graphics/nvtv/Makefile +++ b/graphics/nvtv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:46 sno Exp $ +# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:39 wiz Exp $ DISTNAME= nvtv-0.4.7 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nv-tv-out/} diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 83e163ada7b..c6003b24478 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:05 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:39 wiz Exp $ # DISTNAME= opencv-1.0.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/} diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile index f3e0d6e8bd6..cddedd452ed 100644 --- a/graphics/optipng/Makefile +++ b/graphics/optipng/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2010/04/11 10:08:51 adam Exp $ +# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:39 wiz Exp $ DISTNAME= optipng-0.6.4 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=optipng/} diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo index c89eeb244c0..9424b89d3bc 100644 --- a/graphics/optipng/distinfo +++ b/graphics/optipng/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.16 2010/04/11 10:08:51 adam Exp $ +$NetBSD: distinfo,v 1.17 2010/06/13 22:44:39 wiz Exp $ SHA1 (optipng-0.6.4.tar.gz) = ebb8d623c7f79c5c6942803bb96789103780bce9 RMD160 (optipng-0.6.4.tar.gz) = 6b5248c3c6b744315e70e86b49d998fe66759879 Size (optipng-0.6.4.tar.gz) = 1483806 bytes SHA1 (patch-aa) = 0d1340f90699d1c059d8d8afea67d9fa065a6778 +SHA1 (patch-ab) = a3dc6fc1b0009437d5c7011de6d93cf0539f3565 diff --git a/graphics/optipng/patches/patch-ab b/graphics/optipng/patches/patch-ab new file mode 100644 index 00000000000..54af2d23beb --- /dev/null +++ b/graphics/optipng/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD: patch-ab,v 1.7 2010/06/13 22:44:39 wiz Exp $ + +--- src/opngreduc.c.orig 2010-01-03 05:59:00.000000000 +0000 ++++ src/opngreduc.c +@@ -23,7 +23,11 @@ + #define PNG_NO_PEDANTIC_WARNINGS + #include "png.h" + #if PNG_LIBPNG_VER >= 10400 +-#include "pngpriv.h" ++#define PNG_FILLER 0x8000L ++#define PNG_FLAG_FILLER_AFTER 0x0080 ++#ifndef png_debug ++#define png_debug(l,m) ++#endif + #else + #define trans_alpha trans + #define trans_color trans_values diff --git a/graphics/ov519view/Makefile b/graphics/ov519view/Makefile index d6b3d2d57e7..4ea801afae0 100644 --- a/graphics/ov519view/Makefile +++ b/graphics/ov519view/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2010/02/03 22:32:00 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:39 wiz Exp $ # DISTNAME= ov51x-1.65-1.11-mark PKGNAME= ov519view-0.00 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics x11 MASTER_SITES= http://alpha.dyndns.org/ov511/download/ov51x/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile index dceb822c298..b200ef78410 100644 --- a/graphics/p5-GD/Makefile +++ b/graphics/p5-GD/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:05 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:39 wiz Exp $ DISTNAME= GD-2.44 PKGNAME= p5-${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 SVR4_PKGNAME= p5bd CATEGORIES= graphics perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GD/} diff --git a/graphics/p5-Gdk-Imlib/Makefile b/graphics/p5-Gdk-Imlib/Makefile index aca2d67a68f..735349b6941 100644 --- a/graphics/p5-Gdk-Imlib/Makefile +++ b/graphics/p5-Gdk-Imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/01/18 09:59:05 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:39 wiz Exp $ # PKG_DESTDIR_SUPPORT= user-destdir @@ -7,7 +7,7 @@ MAKE_JOBS_SAFE= no .include "../../x11/p5-gtk/Makefile.common" PKGNAME= p5-Gdk-Imlib-${GTKPERL_VERSION} -PKGREVISION= 7 +PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Perl bindings for Imlib diff --git a/graphics/p5-Gdk-Pixbuf/Makefile b/graphics/p5-Gdk-Pixbuf/Makefile index 099c9090e4c..617592046b3 100644 --- a/graphics/p5-Gdk-Pixbuf/Makefile +++ b/graphics/p5-Gdk-Pixbuf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:05 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:39 wiz Exp $ # PKG_DESTDIR_SUPPORT= user-destdir @@ -7,7 +7,7 @@ MAKE_JOBS_SAFE= no .include "../../x11/p5-gtk/Makefile.common" PKGNAME= p5-Gdk-Pixbuf-${GTKPERL_VERSION} -PKGREVISION= 15 +PKGREVISION= 16 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Perl5 Gtk::Gdk::Pixbuf diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile index 7e2316def68..6a6251d1bea 100644 --- a/graphics/p5-Image-Imlib2/Makefile +++ b/graphics/p5-Image-Imlib2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:05 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:40 wiz Exp $ # DISTNAME= Image-Imlib2-2.02 PKGNAME= p5-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 SVR4_PKGNAME= p5im2 CATEGORIES= graphics perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Image/} diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile index afb3844f643..78587284340 100644 --- a/graphics/p5-PerlMagick/Makefile +++ b/graphics/p5-PerlMagick/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.69 2010/01/18 09:59:05 wiz Exp $ +# $NetBSD: Makefile,v 1.70 2010/06/13 22:44:40 wiz Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../graphics/ImageMagick/Makefile.common" PKGNAME= p5-PerlMagick-${DISTVERSION} -PKGREVISION= 3 +PKGREVISION= 4 SVR4_PKGNAME= p5pma diff --git a/graphics/p5-cairo/Makefile b/graphics/p5-cairo/Makefile index bc8833acc0a..509decf1b19 100644 --- a/graphics/p5-cairo/Makefile +++ b/graphics/p5-cairo/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2009/05/21 19:42:44 sno Exp $ +# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:40 wiz Exp $ # DISTNAME= Cairo-${DIST_VER} PKGNAME= p5-cairo-${DIST_VER} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk2-perl/} diff --git a/graphics/p5-cairo/buildlink3.mk b/graphics/p5-cairo/buildlink3.mk index c8582acf3bf..f9e0818cba0 100644 --- a/graphics/p5-cairo/buildlink3.mk +++ b/graphics/p5-cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:44:40 wiz Exp $ BUILDLINK_TREE+= p5-cairo @@ -6,6 +6,7 @@ BUILDLINK_TREE+= p5-cairo P5_CAIRO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.p5-cairo+= p5-cairo>=1.023 +BUILDLINK_ABI_DEPENDS.p5-cairo?= p5-cairo>=1.061nb1 BUILDLINK_PKGSRCDIR.p5-cairo?= ../../graphics/p5-cairo .include "../../graphics/cairo/buildlink3.mk" diff --git a/graphics/p5-clutter/Makefile b/graphics/p5-clutter/Makefile index d498d3b29d5..e5981e393fa 100644 --- a/graphics/p5-clutter/Makefile +++ b/graphics/p5-clutter/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2010/03/11 04:24:57 obache Exp $ +# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:40 wiz Exp $ # DISTNAME= clutter-perl-1.0.1 PKGNAME= p5-${DISTNAME:S/-perl-/-/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/clutter-perl/1.0/ diff --git a/graphics/panomatic/Makefile b/graphics/panomatic/Makefile index 9cee9bf647e..c34b4afce9a 100644 --- a/graphics/panomatic/Makefile +++ b/graphics/panomatic/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/05/16 10:22:37 adam Exp $ +# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:40 wiz Exp $ DISTNAME= panomatic-0.9.4-src PKGNAME= panomatic-0.9.4 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://aorlinsk2.free.fr/panomatic/bin/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/panomatic/distinfo b/graphics/panomatic/distinfo index d691d26ab25..ef874c55edc 100644 --- a/graphics/panomatic/distinfo +++ b/graphics/panomatic/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/05/16 10:22:37 adam Exp $ +$NetBSD: distinfo,v 1.2 2010/06/13 22:44:40 wiz Exp $ SHA1 (panomatic-0.9.4-src.tar.bz2) = cc0a48d81d090ec90e134afba4b9e700a5843f09 RMD160 (panomatic-0.9.4-src.tar.bz2) = 14ad37420733f950b8f7640c2e7f0b3fe593af89 @@ -6,4 +6,5 @@ Size (panomatic-0.9.4-src.tar.bz2) = 1598683 bytes SHA1 (patch-aa) = 0c30ac34a9f678083c0bc3353f0171c0d3f5bdfa SHA1 (patch-ab) = 316d23c740ee23e35b7b2f4ae8c0cc1b87c47ccb SHA1 (patch-ac) = 2fa2168a257b60ae194675e3b0abd00bf6c7799b +SHA1 (patch-ad) = 9acda36b6ad47584177f4035a78719229132b905 SHA1 (patch-ba) = 65fd25c9ae6fd22046a050687154940ab41849b7 diff --git a/graphics/panomatic/patches/patch-ad b/graphics/panomatic/patches/patch-ad new file mode 100644 index 00000000000..d45fac74db6 --- /dev/null +++ b/graphics/panomatic/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:40 wiz Exp $ + +--- vigra/src/impex/png.cxx.orig 2008-02-14 23:14:15.000000000 +0000 ++++ vigra/src/impex/png.cxx +@@ -270,8 +270,8 @@ namespace vigra { + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { + if (setjmp(png->jmpbuf)) +- 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); ++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); ++ png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; + } + diff --git a/graphics/pdiff/Makefile b/graphics/pdiff/Makefile index 8d3276e836c..0a824be2ef0 100644 --- a/graphics/pdiff/Makefile +++ b/graphics/pdiff/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:06 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:40 wiz Exp $ # DISTNAME= PerceptualDiff-1.0.1 PKGNAME= pdiff-1.0.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pdiff/} @@ -17,6 +17,7 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c c++ USE_CMAKE= yes -.include "../../graphics/png/buildlink3.mk" +# not compatible with png>=1.4 +#.include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/pdiff/distinfo b/graphics/pdiff/distinfo index 620d77412fb..ead7a8ed6cd 100644 --- a/graphics/pdiff/distinfo +++ b/graphics/pdiff/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.3 2007/03/24 20:17:57 heinz Exp $ +$NetBSD: distinfo,v 1.4 2010/06/13 22:44:40 wiz Exp $ SHA1 (PerceptualDiff-1.0.1.tar.gz) = 301d703e7d3c474b663a4abcd63d81500d073be9 RMD160 (PerceptualDiff-1.0.1.tar.gz) = a2931d55b7efa66b907f9002d9380f2f8a088534 Size (PerceptualDiff-1.0.1.tar.gz) = 32344 bytes +SHA1 (patch-aa) = bb10324121c3c8051a1517438ffe87075787c3a5 SHA1 (patch-ab) = f8cc81b1cfdcc7658216d354a917232ec285c64e +SHA1 (patch-ac) = 28fe818975fe6dd747b4a2a4e45d315a96998ec3 diff --git a/graphics/pdiff/patches/patch-aa b/graphics/pdiff/patches/patch-aa new file mode 100644 index 00000000000..f44585b0da1 --- /dev/null +++ b/graphics/pdiff/patches/patch-aa @@ -0,0 +1,42 @@ +$NetBSD: patch-aa,v 1.3 2010/06/13 22:44:40 wiz Exp $ + +Not compatible with png-1.4. + +--- CompareArgs.cpp.orig 2007-03-16 06:17:17.000000000 +0000 ++++ CompareArgs.cpp +@@ -35,8 +35,6 @@ static const char *usage = + \t-gamma g : Value to convert rgb into linear space (default 2.2)\n\ + \t-luminance l : White luminance (default 100.0 cdm^-2)\n\ + \t-output o.ppm : Write difference to the file o.ppm\n\ +-\n\ +-\n Note: Input files can also be in the PNG format\ + \n"; + + CompareArgs::CompareArgs() +@@ -69,26 +67,18 @@ bool CompareArgs::Parse_Args(int argc, c + if (i == 1) { + ImgA = RGBAImage::ReadTiff(argv[1]); + if (!ImgA) { +- ImgA = RGBAImage::ReadPNG(argv[1]); +- if (!ImgA) +- { + ErrorStr = "FAIL: Cannot open "; + ErrorStr += argv[1]; + ErrorStr += "\n"; + return false; +- } + } + } else if (i == 2) { + ImgB = RGBAImage::ReadTiff(argv[2]); + if (!ImgB) { +- ImgB = RGBAImage::ReadPNG(argv[2]); +- if (!ImgB) +- { + ErrorStr = "FAIL: Cannot open "; + ErrorStr += argv[2]; + ErrorStr += "\n"; + return false; +- } + } + } else { + if (strstr(argv[i], "-fov")) { diff --git a/graphics/pdiff/patches/patch-ac b/graphics/pdiff/patches/patch-ac new file mode 100644 index 00000000000..dfb825c9687 --- /dev/null +++ b/graphics/pdiff/patches/patch-ac @@ -0,0 +1,32 @@ +$NetBSD: patch-ac,v 1.1 2010/06/13 22:44:40 wiz Exp $ + +Not compatible with png-1.4. + +--- RGBAImage.cpp.orig 2007-03-16 06:17:17.000000000 +0000 ++++ RGBAImage.cpp +@@ -15,7 +15,9 @@ if not, write to the Free Software Found + */ + + #include "RGBAImage.h" ++#if 0 + #include "png.h" ++#endif + #include "tiff.h" + #include "tiffio.h" + +@@ -54,6 +56,7 @@ RGBAImage* RGBAImage::ReadTiff(char *fil + return fimg; + } + ++#if 0 + // This portion was written by Scott Corley + RGBAImage* RGBAImage::ReadPNG(char *filename) + { +@@ -117,6 +120,7 @@ RGBAImage* RGBAImage::ReadPNG(char *file + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + return fimg; + } ++#endif + + bool RGBAImage::WritePPM() + { diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile index 3660098d381..6fde23ab01a 100644 --- a/graphics/pfstools/Makefile +++ b/graphics/pfstools/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:06 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:40 wiz Exp $ # DISTNAME= pfstools-1.7.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfstools/} diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile index 1724a59d565..85e62f3084d 100644 --- a/graphics/php-gd/Makefile +++ b/graphics/php-gd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2010/02/27 03:35:12 taca Exp $ +# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:41 wiz Exp $ MODNAME= gd +PKGREVISION= 1 CATEGORIES+= graphics COMMENT= PHP extension for GD graphics library diff --git a/graphics/phpsview/Makefile b/graphics/phpsview/Makefile index e94bc7b38dc..53d3ac33477 100644 --- a/graphics/phpsview/Makefile +++ b/graphics/phpsview/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:06 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:41 wiz Exp $ # DISTNAME= pwc-9.0.2 PKGNAME= phpsview-${DISTNAME:C/.*-//} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics x11 MASTER_SITES= http://www.smcc.demon.nl/webcam/ diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile index 9587ab9062d..342116e940c 100644 --- a/graphics/pixieplus/Makefile +++ b/graphics/pixieplus/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2010/01/18 09:59:06 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:41 wiz Exp $ # DISTNAME= pixieplus-0.5.4 -PKGREVISION= 24 +PKGREVISION= 25 CATEGORIES= graphics MASTER_SITES= http://people.fruitsalad.org/avleeuwen/distfiles/pixieplus/ diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile index 61164d884b0..417eaee0cb6 100644 --- a/graphics/ploticus/Makefile +++ b/graphics/ploticus/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.39 2010/01/18 09:59:06 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:41 wiz Exp $ DISTNAME= pl231src PKGNAME= ploticus-2.31pl4 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://ploticus.sourceforge.net/download/ diff --git a/graphics/plotutils-nox11/Makefile b/graphics/plotutils-nox11/Makefile index c96e9b5db48..39460225ba0 100644 --- a/graphics/plotutils-nox11/Makefile +++ b/graphics/plotutils-nox11/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2008/06/12 02:14:32 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:41 wiz Exp $ # -DISTNAME= plotutils-2.4.1 +DISTNAME= plotutils-2.6 PKGNAME= ${DISTNAME:C/-/-nox11-/} -PKGREVISION= 2 +PKGREVISION= 1 CATEGORIES= devel graphics MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/} @@ -21,7 +21,7 @@ PATCHDIR= ${.CURDIR}/../../graphics/plotutils/patches USE_LANGUAGES= c c++ USE_TOOLS+= lex -INFO_FILES= # PLIST +INFO_FILES= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-libplotter diff --git a/graphics/plotutils-nox11/buildlink3.mk b/graphics/plotutils-nox11/buildlink3.mk index 5aa6915a241..93f9555bc6d 100644 --- a/graphics/plotutils-nox11/buildlink3.mk +++ b/graphics/plotutils-nox11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:44:41 wiz Exp $ BUILDLINK_TREE+= plotutils-nox11 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= plotutils-nox11 PLOTUTILS_NOX11_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.plotutils-nox11+= plotutils-nox11>=2.4.1 -BUILDLINK_ABI_DEPENDS.plotutils-nox11?= plotutils-nox11>=2.4.1nb2 +BUILDLINK_ABI_DEPENDS.plotutils-nox11?= plotutils-nox11>=2.4.1nb3 BUILDLINK_PKGSRCDIR.plotutils-nox11?= ../../graphics/plotutils-nox11 .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index 817c4350647..c8f55bbb10a 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.44 2010/05/02 13:28:43 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:41 wiz Exp $ # DISTNAME= plotutils-2.6 +PKGREVISION= 1 CATEGORIES= devel graphics x11 MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/} diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk index ee788149f7d..1fc5f612dbf 100644 --- a/graphics/plotutils/buildlink3.mk +++ b/graphics/plotutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:41 wiz Exp $ BUILDLINK_TREE+= plotutils @@ -6,7 +6,7 @@ BUILDLINK_TREE+= plotutils PLOTUTILS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.plotutils+= plotutils>=2.4.1nb2 -BUILDLINK_ABI_DEPENDS.plotutils+= plotutils>=2.4.1nb5 +BUILDLINK_ABI_DEPENDS.plotutils+= plotutils>=2.6nb1 BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile index 55503f062cf..138a133faba 100644 --- a/graphics/png2html/Makefile +++ b/graphics/png2html/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:06 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:41 wiz Exp $ # DISTNAME= png2html-1.1 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= graphics www MASTER_SITES= http://www.engr.mun.ca/~holden/ diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile index 46401366840..7c7538565e8 100644 --- a/graphics/pngcrush/Makefile +++ b/graphics/pngcrush/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.39 2010/04/18 08:35:44 adam Exp $ +# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:41 wiz Exp $ DISTNAME= pngcrush-1.7.10-nolib PKGNAME= pngcrush-1.7.10 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile index f022f63a9cf..acb7fa83153 100644 --- a/graphics/pornview/Makefile +++ b/graphics/pornview/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:06 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:41 wiz Exp $ # PKGNAME= pornview-0.2.0pre1 DISTNAME= pornview_0.2pre1.orig -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/p/pornview/} diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index 05e0279f568..4cd2f93097f 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:06 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:41 wiz Exp $ DISTNAME= povray-3.6.1 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://www.povray.org/ftp/pub/povray/Official/Unix/ \ ftp://ftp.povray.org/pub/povray/Official/Unix/ diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 5034686eae3..774c4c352a5 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2010/04/13 06:53:19 obache Exp $ +# $NetBSD: Makefile,v 1.50 2010/06/13 22:44:41 wiz Exp $ DISTNAME= pstoedit-3.50 +PKGREVISION= 1 CATEGORIES= converters graphics print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pstoedit/} diff --git a/graphics/py-biggles/Makefile b/graphics/py-biggles/Makefile index f980d550e9d..240e6fb4218 100644 --- a/graphics/py-biggles/Makefile +++ b/graphics/py-biggles/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2009/03/05 18:51:29 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:42 wiz Exp $ # DISTNAME= python-biggles-1.6.3 PKGNAME= ${PYPKGPREFIX}${DISTNAME:S/python//} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=biggles/} diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 795efd5766d..0ed52ebc716 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.22 2009/08/31 08:04:32 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:42 wiz Exp $ # DISTNAME= pycairo-1.8.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ diff --git a/graphics/py-cairo/buildlink3.mk b/graphics/py-cairo/buildlink3.mk index 273f1809d13..1366c70e69e 100644 --- a/graphics/py-cairo/buildlink3.mk +++ b/graphics/py-cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:44:42 wiz Exp $ BUILDLINK_TREE+= pycairo @@ -8,7 +8,7 @@ PY_CAIRO_BUILDLINK3_MK:= . include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.0.2 -BUILDLINK_ABI_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.0.2nb1 +BUILDLINK_ABI_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.8.8nb1 BUILDLINK_PKGSRCDIR.pycairo?= ../../graphics/py-cairo .include "../../math/py-Numeric/buildlink3.mk" diff --git a/graphics/py-clutter-gtk/Makefile b/graphics/py-clutter-gtk/Makefile index fa5d7674007..c901735deaa 100644 --- a/graphics/py-clutter-gtk/Makefile +++ b/graphics/py-clutter-gtk/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/03/11 06:12:59 obache Exp $ +# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:42 wiz Exp $ # DISTNAME= pyclutter-gtk-0.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/pyclutter-gtk/0.10/ diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile index a431306053f..0a6d14306d1 100644 --- a/graphics/py-clutter/Makefile +++ b/graphics/py-clutter/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2010/04/09 01:43:23 obache Exp $ +# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:42 wiz Exp $ # DISTNAME= pyclutter-1.0.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/1.0/ diff --git a/graphics/py-clutter/buildlink3.mk b/graphics/py-clutter/buildlink3.mk index 87285d0ed18..94c421c701c 100644 --- a/graphics/py-clutter/buildlink3.mk +++ b/graphics/py-clutter/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2010/03/11 06:11:51 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:42 wiz Exp $ # BUILDLINK_TREE+= py-clutter @@ -9,6 +9,7 @@ PY_CLUTTER_BUILDLINK3_MK:= . include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-clutter+= ${PYPKGPREFIX}-clutter>=1.0.0 +BUILDLINK_ABI_DEPENDS.py-clutter?= ${PYPKGPREFIX}-clutter>=1.0.2nb1 BUILDLINK_PKGSRCDIR.py-clutter?= ../../graphics/py-clutter .include "../../graphics/clutter/buildlink3.mk" diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index 49e00b5ec24..9a299520764 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2010/01/18 09:59:06 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:42 wiz Exp $ DISTNAME= gdmodule.c PKGNAME= ${PYPKGPREFIX}-gd-1.3 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= graphics python MASTER_SITES= http://starship.python.net/~richard/gdmodule/ EXTRACT_SUFX= diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile index 3d12d2bc85f..18755606ca0 100644 --- a/graphics/py-gdchart/Makefile +++ b/graphics/py-gdchart/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:06 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:42 wiz Exp $ # DISTNAME= gdchart-py-0.6 PKGNAME= ${PYPKGPREFIX}-gdchart-0.6 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= graphics python MASTER_SITES= http://www.nullcube.com/software/pygdchart.html diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile index 1e7fa18fa21..45728a2610d 100644 --- a/graphics/py-goocanvas/Makefile +++ b/graphics/py-goocanvas/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2009/08/26 19:57:48 sno Exp $ +# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:42 wiz Exp $ # DISTNAME= pygoocanvas-0.14.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygoocanvas/0.14/} diff --git a/graphics/py-gtkglext/Makefile b/graphics/py-gtkglext/Makefile index db2986b8fd5..4a13e0f1a8d 100644 --- a/graphics/py-gtkglext/Makefile +++ b/graphics/py-gtkglext/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2010/02/22 12:10:59 obache Exp $ +# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:42 wiz Exp $ # DISTNAME= pygtkglext-1.1.0 PKGNAME= ${PYPKGPREFIX}-pygtkglext-1.1.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkglext/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile index fbd9a47c19e..04c8ef61e38 100644 --- a/graphics/py-matplotlib-gtk2/Makefile +++ b/graphics/py-matplotlib-gtk2/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2010/05/17 16:22:59 drochner Exp $ +# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:42 wiz Exp $ # DISTNAME= matplotlib-0.99.1.2 PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-0.99.1.2 +PKGREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} diff --git a/graphics/py-matplotlib-tk/Makefile b/graphics/py-matplotlib-tk/Makefile index 5142ba35e37..185ce76396a 100644 --- a/graphics/py-matplotlib-tk/Makefile +++ b/graphics/py-matplotlib-tk/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2010/05/17 16:22:59 drochner Exp $ +# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:43 wiz Exp $ # DISTNAME= matplotlib-0.99.1.2 PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-0.99.1.2 +PKGREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile index c1252a8c635..2726ca134d1 100644 --- a/graphics/py-matplotlib/Makefile +++ b/graphics/py-matplotlib/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.25 2010/05/17 16:22:59 drochner Exp $ +# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:42 wiz Exp $ # DISTNAME= matplotlib-0.99.1.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo index 0c937cc1df9..494ae7551c8 100644 --- a/graphics/py-matplotlib/distinfo +++ b/graphics/py-matplotlib/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.10 2010/05/17 16:22:59 drochner Exp $ +$NetBSD: distinfo,v 1.11 2010/06/13 22:44:42 wiz Exp $ SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15 RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7 Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes SHA1 (patch-aa) = 1f900684fec67a895fc1999f72d5c164376b40a6 +SHA1 (patch-ab) = fb7b689a2766c6221a994882fbf9b8942a4f94f9 diff --git a/graphics/py-matplotlib/patches/patch-ab b/graphics/py-matplotlib/patches/patch-ab new file mode 100644 index 00000000000..ad54e2964df --- /dev/null +++ b/graphics/py-matplotlib/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.3 2010/06/13 22:44:42 wiz Exp $ + +--- src/_png.cpp.orig 2009-08-01 19:14:01.000000000 +0000 ++++ src/_png.cpp +@@ -290,7 +290,7 @@ _png_module::read_png(const Py::Tuple& a + + //free the png memory + png_read_end(png_ptr, info_ptr); +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(fp); + for (row = 0; row < height; row++) + delete [] row_pointers[row]; diff --git a/graphics/qcamview/Makefile b/graphics/qcamview/Makefile index 75eec8d2158..7792cb7a305 100644 --- a/graphics/qcamview/Makefile +++ b/graphics/qcamview/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2010/02/03 22:28:35 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:43 wiz Exp $ # DISTNAME= qce-ga-0.40d PKGNAME= qcamview-0.4 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qce-ga/} diff --git a/graphics/qimageblitz/Makefile b/graphics/qimageblitz/Makefile index 97c9bd2641e..24f2317afe0 100644 --- a/graphics/qimageblitz/Makefile +++ b/graphics/qimageblitz/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:07 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:43 wiz Exp $ DISTNAME= qimageblitz-0.0.4 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qimageblitz/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/qimageblitz/buildlink3.mk b/graphics/qimageblitz/buildlink3.mk index ec6fcbc5719..9dd84481fa7 100644 --- a/graphics/qimageblitz/buildlink3.mk +++ b/graphics/qimageblitz/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:07 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:43 wiz Exp $ BUILDLINK_TREE+= qimageblitz @@ -6,7 +6,7 @@ BUILDLINK_TREE+= qimageblitz QIMAGEBLITZ_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qimageblitz+= qimageblitz>=0.0.4 -BUILDLINK_ABI_DEPENDS.qimageblitz?= qimageblitz>=0.0.4nb2 +BUILDLINK_ABI_DEPENDS.qimageblitz?= qimageblitz>=0.0.4nb3 BUILDLINK_PKGSRCDIR.qimageblitz?= ../../graphics/qimageblitz .include "../../x11/qt4-libs/buildlink3.mk" diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile index c743797d9bc..0337034995b 100644 --- a/graphics/qiv/Makefile +++ b/graphics/qiv/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2010/02/07 19:30:35 snj Exp $ +# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:43 wiz Exp $ DISTNAME= qiv-2.2.3 +PKGREVISION= 1 CATEGORIES= graphics x11 MASTER_SITES= http://spiegl.de/qiv/download/ EXTRACT_SUFX= .tgz diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile index 4fb958e651a..6242f259b1e 100644 --- a/graphics/rayshade/Makefile +++ b/graphics/rayshade/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:07 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:43 wiz Exp $ DISTNAME= rayshade.4.0 PKGNAME= rayshade-4.0 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= ftp://graphics.stanford.edu/pub/rayshade/ EXTRACT_SUFX= .tar.Z diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile index 72932b74919..9c9ef4dbbf7 100644 --- a/graphics/ristretto/Makefile +++ b/graphics/ristretto/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/09/03 08:43:49 martin Exp $ +# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:43 wiz Exp $ # DISTNAME= ristretto-0.0.22 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://goodies.xfce.org/releases/ristretto/ diff --git a/graphics/ruby-RMagick/Makefile b/graphics/ruby-RMagick/Makefile index 187371917e5..b047e623be0 100644 --- a/graphics/ruby-RMagick/Makefile +++ b/graphics/ruby-RMagick/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.71 2010/01/18 09:59:07 wiz Exp $ +# $NetBSD: Makefile,v 1.72 2010/06/13 22:44:43 wiz Exp $ DISTNAME= rmagick-2.12.2 -PKGREVISION= 3 +PKGREVISION= 4 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/rmagick/RMagick/} CATEGORIES= graphics diff --git a/graphics/ruby-clutter-cairo/Makefile b/graphics/ruby-clutter-cairo/Makefile index 567f728a3d0..6a39a2de8ba 100644 --- a/graphics/ruby-clutter-cairo/Makefile +++ b/graphics/ruby-clutter-cairo/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2009/10/26 08:39:36 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:43 wiz Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-clutter-cairo-${VERSION} COMMENT= Ruby binding for Clutter Cairo library -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics PKG_DESTDIR_SUPPORT= user-destdir diff --git a/graphics/ruby-clutter-core/Makefile b/graphics/ruby-clutter-core/Makefile index e96d707645f..719e52de391 100644 --- a/graphics/ruby-clutter-core/Makefile +++ b/graphics/ruby-clutter-core/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2009/10/26 08:37:27 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:43 wiz Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-clutter-core-${VERSION} COMMENT= Ruby binding for Clutter Core library -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics PKG_DESTDIR_SUPPORT= user-destdir diff --git a/graphics/ruby-clutter-gtk/Makefile b/graphics/ruby-clutter-gtk/Makefile index 09cf44615b7..bf83f17eef3 100644 --- a/graphics/ruby-clutter-gtk/Makefile +++ b/graphics/ruby-clutter-gtk/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2009/10/26 08:38:33 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:43 wiz Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-clutter-gtk-${VERSION} COMMENT= Ruby binding for Clutter GTK+ widget -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics PKG_DESTDIR_SUPPORT= user-destdir diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile index a031285b5ce..af7bb0329b6 100644 --- a/graphics/ruby-gd/Makefile +++ b/graphics/ruby-gd/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:07 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:43 wiz Exp $ DISTNAME= ruby-gd-0.8.0 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/graphics/ruby-gnome2-gdkpixbuf/Makefile b/graphics/ruby-gnome2-gdkpixbuf/Makefile index f1430f8031e..2eec8556883 100644 --- a/graphics/ruby-gnome2-gdkpixbuf/Makefile +++ b/graphics/ruby-gnome2-gdkpixbuf/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2009/10/12 03:09:31 obache Exp $ +# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:44 wiz Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf-${VERSION} COMMENT= Ruby binding of GdkPixbuf-2.x +PKGREVISION= 1 CATEGORIES= graphics devel CONFLICTS+= ruby-gnome2-gdkpixbuf-[0-9]* diff --git a/graphics/ruby-gnome2-gnomecanvas/Makefile b/graphics/ruby-gnome2-gnomecanvas/Makefile index f71dcbfa393..cf9423b2145 100644 --- a/graphics/ruby-gnome2-gnomecanvas/Makefile +++ b/graphics/ruby-gnome2-gnomecanvas/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2009/10/12 03:09:31 obache Exp $ +# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:44 wiz Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gnomecanvas-${VERSION} COMMENT= Ruby binding of GnomeCanvas-2.x +PKGREVISION= 1 CATEGORIES= graphics gnome CONFLICTS+= ruby-gnome2-gnomecanvas-[0-9]* diff --git a/graphics/ruby-gnome2-goocanvas/Makefile b/graphics/ruby-gnome2-goocanvas/Makefile index b6f811819ca..009b6560870 100644 --- a/graphics/ruby-gnome2-goocanvas/Makefile +++ b/graphics/ruby-gnome2-goocanvas/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2009/10/12 03:09:33 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:44 wiz Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-goocanvas-${VERSION} COMMENT= Ruby binding of GooCanvas +PKGREVISION= 1 CATEGORIES= graphics gnome PKG_DESTDIR_SUPPORT= user-destdir diff --git a/graphics/ruby-gnome2-gtkglext/Makefile b/graphics/ruby-gnome2-gtkglext/Makefile index e74eeb2a37b..3cacfc67715 100644 --- a/graphics/ruby-gnome2-gtkglext/Makefile +++ b/graphics/ruby-gnome2-gtkglext/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2009/10/12 03:09:32 obache Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:44 wiz Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtkglext-${VERSION} COMMENT= Ruby binding of gtkglext +PKGREVISION= 1 CATEGORIES= graphics PKG_DESTDIR_SUPPORT= user-destdir diff --git a/graphics/ruby-gnome2-libart/Makefile b/graphics/ruby-gnome2-libart/Makefile index 95c785761e5..240c9d21785 100644 --- a/graphics/ruby-gnome2-libart/Makefile +++ b/graphics/ruby-gnome2-libart/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2010/01/18 09:59:08 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:44 wiz Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-libart-${VERSION} COMMENT= Ruby binding of Libart_lgpl -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics CONFLICTS+= ruby-gnome2-libart-[0-9]* diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile index 35f91d8f14c..0f966648cfc 100644 --- a/graphics/ruby-gnome2-rsvg/Makefile +++ b/graphics/ruby-gnome2-rsvg/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2009/10/12 03:09:32 obache Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:44 wiz Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION} COMMENT= Ruby binding of librsvg +PKGREVISION= 1 CATEGORIES= graphics PKG_DESTDIR_SUPPORT= user-destdir diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile index 12d1d7ec0d8..d747a324a9d 100644 --- a/graphics/ruby-imlib2/Makefile +++ b/graphics/ruby-imlib2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:08 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:44 wiz Exp $ DISTNAME= imlib2-ruby-0.5.2 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//} -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://pablotron.org/files/gems/ diff --git a/graphics/ruby-rcairo/Makefile b/graphics/ruby-rcairo/Makefile index 6f701d0d665..315063b0fce 100644 --- a/graphics/ruby-rcairo/Makefile +++ b/graphics/ruby-rcairo/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2010/05/25 04:39:46 obache Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:44 wiz Exp $ DISTNAME= rcairo-1.8.1 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ diff --git a/graphics/ruby-rcairo/buildlink3.mk b/graphics/ruby-rcairo/buildlink3.mk index 465a513bb13..5deba6eba26 100644 --- a/graphics/ruby-rcairo/buildlink3.mk +++ b/graphics/ruby-rcairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/05/27 05:47:44 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:44 wiz Exp $ BUILDLINK_TREE+= ruby-rcairo @@ -6,6 +6,7 @@ BUILDLINK_TREE+= ruby-rcairo RUBY_RCAIRO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ruby-rcairo+= ${RUBY_PKGPREFIX}-rcairo>=1.6.0 +BUILDLINK_ABI_DEPENDS.ruby-rcairo?= ruby18-rcairo>=1.8.1nb2 BUILDLINK_PKGSRCDIR.ruby-rcairo?= ../../graphics/ruby-rcairo .include "../../graphics/cairo/buildlink3.mk" diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile index bacc52f3024..788ff74d5c9 100644 --- a/graphics/sane-frontends/Makefile +++ b/graphics/sane-frontends/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2010/01/18 09:59:08 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2010/06/13 22:44:44 wiz Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir DISTNAME= sane-frontends-${SANE_VERSION} SANE_MICRO= 14 -PKGREVISION= 7 +PKGREVISION= 8 COMMENT= Frontends for access to scanners, digital cameras, frame grabbers etc diff --git a/graphics/scidavis/Makefile b/graphics/scidavis/Makefile index 95f61823cd3..ab3ae35c56c 100644 --- a/graphics/scidavis/Makefile +++ b/graphics/scidavis/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2010/02/10 19:17:39 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:44 wiz Exp $ # DISTNAME= scidavis-0.2.3 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scidavis/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile index 5dae75decf6..d2624102575 100644 --- a/graphics/scigraphica/Makefile +++ b/graphics/scigraphica/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.48 2010/02/25 21:41:11 drochner Exp $ +# $NetBSD: Makefile,v 1.49 2010/06/13 22:44:44 wiz Exp $ # DISTNAME= scigraphica-2.1.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scigraphica/} diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile index e696f6c5267..e4192d42a13 100644 --- a/graphics/scrot/Makefile +++ b/graphics/scrot/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:08 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:44 wiz Exp $ DISTNAME= scrot-0.8 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= graphics MASTER_SITES= http://linuxbrit.co.uk/downloads/ diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile index 8eeabc4b791..98f141bbda5 100644 --- a/graphics/showimg/Makefile +++ b/graphics/showimg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2010/02/03 22:24:30 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:45 wiz Exp $ # DISTNAME= showimg-0.9.5 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= kde graphics x11 MASTER_SITES= http://www.jalix.org/projects/showimg/download/0.9.5/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile index dba30b34136..0d07d51950c 100644 --- a/graphics/simage/Makefile +++ b/graphics/simage/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:08 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:45 wiz Exp $ DISTNAME= simage-1.6.1 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= graphics MASTER_SITES= ftp://ftp.coin3d.org/pub/coin/src/ diff --git a/graphics/simage/buildlink3.mk b/graphics/simage/buildlink3.mk index 68a4fc8dc35..deff954c936 100644 --- a/graphics/simage/buildlink3.mk +++ b/graphics/simage/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:08 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:45 wiz Exp $ BUILDLINK_TREE+= simage @@ -6,7 +6,7 @@ BUILDLINK_TREE+= simage SIMAGE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.simage+= simage>=1.6.1 -BUILDLINK_ABI_DEPENDS.simage+= simage>=1.6.1nb7 +BUILDLINK_ABI_DEPENDS.simage+= simage>=1.6.1nb8 BUILDLINK_PKGSRCDIR.simage?= ../../graphics/simage .include "../../audio/libsndfile/buildlink3.mk" diff --git a/graphics/snx101view/Makefile b/graphics/snx101view/Makefile index 56941d59aa3..3c72e83eac7 100644 --- a/graphics/snx101view/Makefile +++ b/graphics/snx101view/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2010/02/03 22:16:14 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:45 wiz Exp $ # DISTNAME= snx101util-0.2 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics x11 MASTER_SITES= http://www.medias.ne.jp/~takam/bsd/ diff --git a/graphics/spcaview/Makefile b/graphics/spcaview/Makefile index 7580546498d..9e61e46b692 100644 --- a/graphics/spcaview/Makefile +++ b/graphics/spcaview/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2010/02/15 17:21:20 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:45 wiz Exp $ # DISTNAME= spca5xx-20060402 PKGNAME= spcaview-0.6b #PKGREVISION= 1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics x11 MASTER_SITES= http://mxhaard.free.fr/spca50x/Download/oldrelease/ diff --git a/graphics/tango-icon-theme/Makefile b/graphics/tango-icon-theme/Makefile index ca461f1b379..20fa1fb5cd4 100644 --- a/graphics/tango-icon-theme/Makefile +++ b/graphics/tango-icon-theme/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:09 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:45 wiz Exp $ DISTNAME= tango-icon-theme-0.8.90 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://tango.freedesktop.org/releases/ diff --git a/graphics/tuxpaint-config/Makefile b/graphics/tuxpaint-config/Makefile index 5bf8d5e32a4..4a2b9f34a23 100644 --- a/graphics/tuxpaint-config/Makefile +++ b/graphics/tuxpaint-config/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2010/02/03 22:13:09 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:45 wiz Exp $ # DISTNAME= tuxpaint-config-0.0.8 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.billsgames.com/unix/x/tuxpaint/config/ diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile index 8822fa78b9b..ad089bda536 100644 --- a/graphics/tuxpaint/Makefile +++ b/graphics/tuxpaint/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.54 2010/02/03 22:13:09 joerg Exp $ +# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:45 wiz Exp $ # DISTNAME= tuxpaint-0.9.17 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/} diff --git a/graphics/ucview/Makefile b/graphics/ucview/Makefile index 26fa686c07b..f17da6f3aee 100644 --- a/graphics/ucview/Makefile +++ b/graphics/ucview/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:51 sno Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:45 wiz Exp $ DISTNAME= ucview-0.22 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://unicap-imaging.org/downloads/ diff --git a/graphics/unicap/Makefile b/graphics/unicap/Makefile index 6d597f4e76e..bd2d60a0579 100644 --- a/graphics/unicap/Makefile +++ b/graphics/unicap/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:51 sno Exp $ +# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:45 wiz Exp $ DISTNAME= unicap-0.9.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://unicap-imaging.org/downloads/ diff --git a/graphics/unicap/distinfo b/graphics/unicap/distinfo index 83cf0853373..42f1e9d3d80 100644 --- a/graphics/unicap/distinfo +++ b/graphics/unicap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2009/11/26 15:04:03 joerg Exp $ +$NetBSD: distinfo,v 1.4 2010/06/13 22:44:45 wiz Exp $ SHA1 (unicap-0.9.3.tar.gz) = b9d1580a9e10d15a8ab86400a0200b72e582dc4d RMD160 (unicap-0.9.3.tar.gz) = dd2b687197ac81534d2adbc5db8dcc2bdc3e3aad @@ -16,7 +16,8 @@ SHA1 (patch-aj) = c04fa9aeb3c6fc93524019b1d69f6b3da6b62bc6 SHA1 (patch-ak) = 41025b0d650d8e06a2f4950b5113414f5a4d6ec1 SHA1 (patch-al) = cc6b286f54b902907e49028797e644af9eaff132 SHA1 (patch-am) = 32c85d4c7353a9f2130a7105067f555365fcc883 -SHA1 (patch-ap) = f80854eb8708e950384e18cad0d04fda66ca5267 +SHA1 (patch-an) = 8167ed1f1f3a7882f3c07feaddaf429a90bf1902 +SHA1 (patch-ap) = 29cb7f81e4e56c0178c453fe80f2c576eefeb6c6 SHA1 (patch-aq) = 396dae0f7695bd816479117b50f577d67aa6efbc SHA1 (patch-ar) = d0a2b4411ca9df52b0041cd532779ccb9fc1efdf SHA1 (patch-as) = 56db81f3a643f3c15d1c7572c63af23728c4b4eb diff --git a/graphics/unicap/patches/patch-an b/graphics/unicap/patches/patch-an new file mode 100644 index 00000000000..1bf5d27ae39 --- /dev/null +++ b/graphics/unicap/patches/patch-an @@ -0,0 +1,58 @@ +$NetBSD: patch-an,v 1.3 2010/06/13 22:44:45 wiz Exp $ + +--- libucil/ucil_png.c.orig 2008-06-12 15:25:11.000000000 +0000 ++++ libucil/ucil_png.c +@@ -77,7 +77,7 @@ static int read_png(FILE *fp, unsigned i + if (info_ptr == NULL) + { + fclose(fp); +- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, NULL, NULL); + return( -1 ); + } + +@@ -89,7 +89,7 @@ static int read_png(FILE *fp, unsigned i + 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); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(fp); + /* If we get here, we had a problem reading the file */ + return( -1 ); +@@ -109,7 +109,7 @@ static int read_png(FILE *fp, unsigned i + * adjustment), then you can read the entire image (including + * pixels) into the info structure with this call: + */ +- png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, png_voidp_NULL); ++ png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL); + + /* At this point you have read the entire image */ + +@@ -174,7 +174,7 @@ static int read_png(FILE *fp, unsigned i + } + + /* clean up after the read, and free any memory allocated - REQUIRED */ +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + + /* close the file */ + fclose(fp); +@@ -230,7 +230,7 @@ static int read_png(FILE *fp, unsigned i + /* if (info_ptr == NULL) */ + /* { */ + /* fclose(fp); */ +-/* png_destroy_write_struct(&png_ptr, png_infopp_NULL); */ ++/* png_destroy_write_struct(&png_ptr, NULL); */ + /* return( -1 ); */ + /* } */ + +@@ -252,7 +252,7 @@ static int read_png(FILE *fp, unsigned i + /* * image info living info in the structure. You could "|" many */ + /* * PNG_TRANSFORM flags into the png_transforms integer here. */ + /* *\/ */ +-/* png_write_png( png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, png_voidp_NULL ); */ ++/* png_write_png( png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL ); */ + + /* /\* If you png_malloced a palette, free it here (don't free info_ptr->palette, */ + /* as recommended in versions 1.0.5m and earlier of this example; if */ diff --git a/graphics/unicap/patches/patch-ap b/graphics/unicap/patches/patch-ap index 2619d1640ec..8f88ec3a8e5 100644 --- a/graphics/unicap/patches/patch-ap +++ b/graphics/unicap/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ +$NetBSD: patch-ap,v 1.3 2010/06/13 22:44:45 wiz Exp $ --- configure.orig 2008-10-01 12:15:58.000000000 -0400 @@ -138,15 +138,6 @@ $NetBSD: patch-ap,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ cat >>confdefs.h <<\_ACEOF #define UNICAP_THREADS 1 -@@ -26728,6 +26728,8 @@ do - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; @@ -27969,7 +27971,7 @@ if test x$VID21394_VISCA = xyes; then VID21394="$VID21394 with visca support" fi diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile index dbb8d95d8fc..fe1f1fe565f 100644 --- a/graphics/urt/Makefile +++ b/graphics/urt/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.53 2010/01/18 09:59:09 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2010/06/13 22:44:45 wiz Exp $ DISTNAME= urt PKGNAME= urt-3.1b1 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= graphics MASTER_SITES= ftp://ftp.iastate.edu/pub/utah-raster/ DISTFILES= urt-3.1b.tar.Z urt-doc.tar.Z urt-img.tar.Z diff --git a/graphics/urt/buildlink3.mk b/graphics/urt/buildlink3.mk index 16b896a4c52..c5fc6b676e3 100644 --- a/graphics/urt/buildlink3.mk +++ b/graphics/urt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2010/01/18 09:59:09 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:45 wiz Exp $ BUILDLINK_TREE+= urt @@ -6,7 +6,7 @@ BUILDLINK_TREE+= urt URT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.urt+= urt>=3.1b1nb5 -BUILDLINK_ABI_DEPENDS.urt+= urt>=3.1b1nb10 +BUILDLINK_ABI_DEPENDS.urt+= urt>=3.1b1nb11 BUILDLINK_PKGSRCDIR.urt?= ../../graphics/urt .include "../../graphics/netpbm/buildlink3.mk" diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile index 7b8d35cac32..c2457f72761 100644 --- a/graphics/vid/Makefile +++ b/graphics/vid/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2010/01/18 09:59:09 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:46 wiz Exp $ # DISTNAME= vid-1.0.1 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://members.home.com/housel/ diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index db10757401b..8884039bd79 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2010/01/18 09:59:09 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:46 wiz Exp $ # DISTNAME= vigra1.6.0 PKGNAME= ${DISTNAME:C/^[[:alpha:]]+/&-/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/ diff --git a/graphics/vigra/distinfo b/graphics/vigra/distinfo index 60cfabd1d3d..a5edee37a94 100644 --- a/graphics/vigra/distinfo +++ b/graphics/vigra/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/08/25 18:17:56 bjs Exp $ +$NetBSD: distinfo,v 1.2 2010/06/13 22:44:46 wiz Exp $ SHA1 (vigra1.6.0.tar.gz) = 9714a0c4efb77726a1140329e98e5db057f9a69f RMD160 (vigra1.6.0.tar.gz) = cc9f6626801182a0ee71ec9eb8fa34c38f8777a7 Size (vigra1.6.0.tar.gz) = 16525605 bytes SHA1 (patch-aa) = 612e0284ba4ff531ad376586a125a4139d1bdbff +SHA1 (patch-ab) = 3b8f1d37db04377ab76287a01a3e1d436f60b04e diff --git a/graphics/vigra/patches/patch-ab b/graphics/vigra/patches/patch-ab new file mode 100644 index 00000000000..2443fc6bf56 --- /dev/null +++ b/graphics/vigra/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1 2010/06/13 22:44:46 wiz Exp $ + +--- src/impex/png.cxx.orig 2008-08-13 13:15:45.000000000 +0000 ++++ src/impex/png.cxx +@@ -270,8 +270,8 @@ namespace vigra { + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { + if (setjmp(png->jmpbuf)) +- 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); ++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); ++ png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; + } + diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile index 8d1a3e8ea08..93e07090f4b 100644 --- a/graphics/vp/Makefile +++ b/graphics/vp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:09 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:46 wiz Exp $ # DISTNAME= vp-1.5 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://math.smsu.edu/~erik/files/ diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile index 999bee8c541..a073c983088 100644 --- a/graphics/wxsvg/Makefile +++ b/graphics/wxsvg/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2010/05/07 17:58:30 drochner Exp $ +# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:46 wiz Exp $ # DISTNAME= wxsvg-1.0.4 PKGNAME= wxsvg-1.0.4 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxsvg/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/wxsvg/buildlink3.mk b/graphics/wxsvg/buildlink3.mk index 5251c5de9f2..f8166cb29ca 100644 --- a/graphics/wxsvg/buildlink3.mk +++ b/graphics/wxsvg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:09 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:46 wiz Exp $ BUILDLINK_TREE+= wxsvg @@ -6,7 +6,7 @@ BUILDLINK_TREE+= wxsvg WXSVG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.wxsvg+= wxsvg>=1.0beta5 -BUILDLINK_ABI_DEPENDS.wxsvg?= wxsvg>=1.0nb2 +BUILDLINK_ABI_DEPENDS.wxsvg?= wxsvg>=1.0.4nb1 BUILDLINK_PKGSRCDIR.wxsvg?= ../../graphics/wxsvg .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile index d059726e841..bb88d69442b 100644 --- a/graphics/xart/Makefile +++ b/graphics/xart/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.49 2010/01/18 09:59:10 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2010/06/13 22:44:46 wiz Exp $ # DISTNAME= xart19980415 PKGNAME= xart-19980415 -PKGREVISION= 13 +PKGREVISION= 14 CATEGORIES= graphics x11 MASTER_SITES= http://linux01.gwdg.de/~rhohen/linux/ EXTRACT_SUFX= .tgz diff --git a/graphics/xart/distinfo b/graphics/xart/distinfo index 4f8aac690eb..ee54cd0f246 100644 --- a/graphics/xart/distinfo +++ b/graphics/xart/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.12 2006/08/09 17:13:58 darcy Exp $ +$NetBSD: distinfo,v 1.13 2010/06/13 22:44:46 wiz Exp $ SHA1 (xart19980415.tgz) = d4445392e33a5dcf5ae951babac82394e7cdd65c RMD160 (xart19980415.tgz) = 99077c23a798d8c0026bd53450052b1a8cf6ff6f Size (xart19980415.tgz) = 343909 bytes SHA1 (patch-aa) = 7d8ae61d9a624cc537396f406b496f28376cf7b5 SHA1 (patch-ab) = b0f00e29560ce786e37a8ba62fef82dae80c4ee9 -SHA1 (patch-ac) = d8d359dec9e440a821b7af79e810f5f067f3ab6f +SHA1 (patch-ac) = 618003b6d192e85a1aa5f64b0f8eccfec991012e SHA1 (patch-ad) = 08059ca068d156be0e31283180c5deaebb99f7bd SHA1 (patch-ae) = d0d87fe957cbec5979e635270d2ad05b294f7530 SHA1 (patch-af) = 2ee00a7b02d14a5962ac0f561ede6423c4d45801 diff --git a/graphics/xart/patches/patch-ac b/graphics/xart/patches/patch-ac index 33d5c25c792..b2a27fc175e 100644 --- a/graphics/xart/patches/patch-ac +++ b/graphics/xart/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.7 2006/04/19 17:04:31 wiz Exp $ +$NetBSD: patch-ac,v 1.8 2010/06/13 22:44:46 wiz Exp $ --- Local.config.orig 1998-04-01 02:58:05.000000000 +0200 +++ Local.config @@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.7 2006/04/19 17:04:31 wiz Exp $ #ifdef HavePNG -PNG_LIB = -L/usr/local/lib -lpng -lz -PNG_INCLUDE = -I/usr/local/include/png -+PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng12 -lz -lm ++PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng -lz -lm +PNG_INCLUDE = -I${LOCALBASE}/include #endif diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk index cbafd7ee4ac..732edd05e7c 100644 --- a/graphics/xfce4-icon-theme/buildlink3.mk +++ b/graphics/xfce4-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2009/09/16 01:15:33 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:46 wiz Exp $ BUILDLINK_TREE+= xfce4-icon-theme @@ -6,6 +6,7 @@ BUILDLINK_TREE+= xfce4-icon-theme XFCE4_ICON_THEME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.4.3 +BUILDLINK_ABI_DEPENDS.xfce4-icon-theme?= xfce4-icon-theme>=4.4.3 BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 80ef88e4925..c0401d7fb11 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.61 2010/01/18 09:59:10 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2010/06/13 22:44:46 wiz Exp $ DISTNAME= xfig.3.2.5b.full PKGNAME= xfig-3.2.5b -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcj/} diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index 9f7b928d2ec..e1eff09b0f7 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:10 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:46 wiz Exp $ DISTNAME= xli-2005-02-27 PKGNAME= xli-1.17.0 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics x11 MASTER_SITES= http://pantransit.reptiles.org/prog/xli/ diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index bc9cdd61e7a..878de024d9a 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2010/01/18 09:59:10 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2010/06/13 22:44:46 wiz Exp $ DISTNAME= xpaint-2.7.8.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sf-xpaint/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index bbe29ec7bde..0a8be33812e 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.81 2010/01/18 09:59:10 wiz Exp $ +# $NetBSD: Makefile,v 1.82 2010/06/13 22:44:47 wiz Exp $ DISTNAME= xsane-0.994 PKGNAME= xsane-0.99.4 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://www.xsane.org/download/old/ \ ftp://ftp.u-aizu.ac.jp/pub/misc/device/scsi/scanner/sane/xsane/ \ diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 8223299a952..873c01d540f 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.80 2010/03/30 09:51:30 obache Exp $ +# $NetBSD: Makefile,v 1.81 2010/06/13 22:44:47 wiz Exp $ DISTNAME= xv-3.10a -PKGREVISION= 15 +PKGREVISION= 16 CATEGORIES= graphics x11 MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ DISTFILES= ${DEFAULT_DISTFILES} ${JUMBO_PATCHES} diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile index 53eb80acdaf..89fe3110152 100644 --- a/graphics/xzgv/Makefile +++ b/graphics/xzgv/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2009/08/26 19:57:52 sno Exp $ +# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:47 wiz Exp $ # DISTNAME= xzgv-0.9 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xzgv/} diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile index 33d57792edf..bd949926015 100644 --- a/graphics/zphoto/Makefile +++ b/graphics/zphoto/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2010/05/15 12:57:04 obache Exp $ +# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:47 wiz Exp $ # DISTNAME= zphoto-1.2 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://0xcc.net/zphoto/ -- cgit v1.2.3