summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-03-06 16:02:28 +0000
committerwiz <wiz@pkgsrc.org>2011-03-06 16:02:28 +0000
commit3b0faad4eed25929eb9466f79a86bd63833058b2 (patch)
tree2e0950fe4261acbafec3ff24573aba194ce53bb6 /graphics
parent12dcf0b377f5ecb5f0057fc9c6e4433ef06e171f (diff)
downloadpkgsrc-3b0faad4eed25929eb9466f79a86bd63833058b2.tar.gz
Remove GTK1 using packages for which noone spoke up for the last two weeks
on pkgsrc-users in the thread "[HEADS UP] Package removal -- please check".
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Makefile15
-rw-r--r--graphics/g3d/DESCR4
-rw-r--r--graphics/g3d/Makefile27
-rw-r--r--graphics/g3d/PLIST25
-rw-r--r--graphics/g3d/distinfo7
-rw-r--r--graphics/g3d/patches/patch-aa27
-rw-r--r--graphics/g3d/patches/patch-ab19
-rw-r--r--graphics/gimageview/DESCR5
-rw-r--r--graphics/gimageview/Makefile40
-rw-r--r--graphics/gimageview/PLIST121
-rw-r--r--graphics/gimageview/distinfo20
-rw-r--r--graphics/gimageview/patches/patch-aa15
-rw-r--r--graphics/gimageview/patches/patch-ab12
-rw-r--r--graphics/gimageview/patches/patch-ac13
-rw-r--r--graphics/gimageview/patches/patch-ad27
-rw-r--r--graphics/gimageview/patches/patch-ae13
-rw-r--r--graphics/gimageview/patches/patch-af15
-rw-r--r--graphics/gimageview/patches/patch-ag15
-rw-r--r--graphics/gimageview/patches/patch-ah13
-rw-r--r--graphics/gimageview/patches/patch-ai13
-rw-r--r--graphics/gimageview/patches/patch-aj13
-rw-r--r--graphics/gimageview/patches/patch-ak25
-rw-r--r--graphics/gimageview/patches/patch-al22
-rw-r--r--graphics/gimageview/patches/patch-am13
-rw-r--r--graphics/gimageview/patches/patch-plugins_image__loader_png__loader.c16
-rw-r--r--graphics/gimageview/patches/patch-plugins_image__saver_png__saver.c16
-rw-r--r--graphics/gimp1-data/DESCR4
-rw-r--r--graphics/gimp1-data/Makefile23
-rw-r--r--graphics/gimp1-data/PLIST152
-rw-r--r--graphics/gimp1-data/distinfo5
-rw-r--r--graphics/gimp1-wideangle/DESCR2
-rw-r--r--graphics/gimp1-wideangle/Makefile28
-rw-r--r--graphics/gimp1-wideangle/PLIST2
-rw-r--r--graphics/gimp1-wideangle/distinfo5
-rw-r--r--graphics/gimp1/DESCR4
-rw-r--r--graphics/gimp1/Makefile21
-rw-r--r--graphics/gphoto/DESCR14
-rw-r--r--graphics/gphoto/Makefile21
-rw-r--r--graphics/gphoto/PLIST53
-rw-r--r--graphics/gphoto/distinfo26
-rw-r--r--graphics/gphoto/patches/patch-aa22
-rw-r--r--graphics/gphoto/patches/patch-ab21
-rw-r--r--graphics/gphoto/patches/patch-ac13
-rw-r--r--graphics/gphoto/patches/patch-ad12
-rw-r--r--graphics/gphoto/patches/patch-ae21
-rw-r--r--graphics/gphoto/patches/patch-af20
-rw-r--r--graphics/gphoto/patches/patch-ai29
-rw-r--r--graphics/gphoto/patches/patch-ao23
-rw-r--r--graphics/gphoto/patches/patch-ap25
-rw-r--r--graphics/gphoto/patches/patch-aq57
-rw-r--r--graphics/gphoto/patches/patch-ar75
-rw-r--r--graphics/gphoto/patches/patch-as19
-rw-r--r--graphics/gphoto/patches/patch-at23
-rw-r--r--graphics/gphoto/patches/patch-au19
-rw-r--r--graphics/gphoto/patches/patch-av19
-rw-r--r--graphics/gphoto/patches/patch-aw45
-rw-r--r--graphics/gphoto/patches/patch-ax133
-rw-r--r--graphics/gphoto/patches/patch-ay17
-rw-r--r--graphics/gphoto/patches/patch-az19
-rw-r--r--graphics/gphoto/patches/patch-ba23
-rw-r--r--graphics/gphoto/patches/patch-bb12
-rw-r--r--graphics/ov519view/DESCR4
-rw-r--r--graphics/ov519view/MESSAGE8
-rw-r--r--graphics/ov519view/Makefile41
-rw-r--r--graphics/ov519view/PLIST7
-rw-r--r--graphics/ov519view/distinfo13
-rw-r--r--graphics/ov519view/patches/patch-aa15
-rw-r--r--graphics/ov519view/patches/patch-ab16
-rw-r--r--graphics/ov519view/patches/patch-ac16
-rw-r--r--graphics/ov519view/patches/patch-ad16
-rw-r--r--graphics/ov519view/patches/patch-ae16
-rw-r--r--graphics/phpsview/DESCR6
-rw-r--r--graphics/phpsview/Makefile37
-rw-r--r--graphics/phpsview/PLIST3
-rw-r--r--graphics/phpsview/distinfo13
-rw-r--r--graphics/phpsview/patches/patch-aa16
-rw-r--r--graphics/phpsview/patches/patch-ab16
-rw-r--r--graphics/phpsview/patches/patch-ac16
-rw-r--r--graphics/phpsview/patches/patch-ad16
-rw-r--r--graphics/phpsview/patches/patch-ae16
-rw-r--r--graphics/pixieplus/DESCR13
-rw-r--r--graphics/pixieplus/Makefile32
-rw-r--r--graphics/pixieplus/PLIST235
-rw-r--r--graphics/pixieplus/distinfo19
-rw-r--r--graphics/pixieplus/patches/patch-aa652
-rw-r--r--graphics/pixieplus/patches/patch-ab56
-rw-r--r--graphics/pixieplus/patches/patch-ac27
-rw-r--r--graphics/pixieplus/patches/patch-ad43
-rw-r--r--graphics/pixieplus/patches/patch-ae13
-rw-r--r--graphics/pixieplus/patches/patch-af13
-rw-r--r--graphics/pixieplus/patches/patch-ag17
-rw-r--r--graphics/pixieplus/patches/patch-ah13
-rw-r--r--graphics/pixieplus/patches/patch-ai13
-rw-r--r--graphics/pixieplus/patches/patch-aj13
-rw-r--r--graphics/pixieplus/patches/patch-ak16
-rw-r--r--graphics/pixieplus/patches/patch-al13
-rw-r--r--graphics/pixieplus/patches/patch-am13
-rw-r--r--graphics/pixieplus/patches/patch-an14
-rw-r--r--graphics/pornview/DESCR5
-rw-r--r--graphics/pornview/Makefile29
-rw-r--r--graphics/pornview/PLIST7
-rw-r--r--graphics/pornview/TODO2
-rw-r--r--graphics/pornview/distinfo11
-rw-r--r--graphics/pornview/options.mk34
-rw-r--r--graphics/pornview/patches/patch-aa31
-rw-r--r--graphics/pornview/patches/patch-ab13
-rw-r--r--graphics/pornview/patches/patch-ac14
-rw-r--r--graphics/pornview/patches/patch-ad76
-rw-r--r--graphics/pornview/patches/patch-ae12
-rw-r--r--graphics/pornview/patches/patch-af15
-rw-r--r--graphics/ppmtoxvpic/DESCR5
-rw-r--r--graphics/ppmtoxvpic/Makefile18
-rw-r--r--graphics/ppmtoxvpic/PLIST3
-rw-r--r--graphics/ppmtoxvpic/distinfo6
-rw-r--r--graphics/ppmtoxvpic/patches/patch-aa13
-rw-r--r--graphics/qcamview/DESCR7
-rw-r--r--graphics/qcamview/Makefile40
-rw-r--r--graphics/qcamview/PLIST7
-rw-r--r--graphics/qcamview/distinfo14
-rw-r--r--graphics/qcamview/patches/patch-aa18
-rw-r--r--graphics/qcamview/patches/patch-ab16
-rw-r--r--graphics/qcamview/patches/patch-ac16
-rw-r--r--graphics/qcamview/patches/patch-ad16
-rw-r--r--graphics/qcamview/patches/patch-ae16
-rw-r--r--graphics/qcamview/patches/patch-af16
-rw-r--r--graphics/snx101view/DESCR4
-rw-r--r--graphics/snx101view/Makefile23
-rw-r--r--graphics/snx101view/PLIST7
-rw-r--r--graphics/snx101view/distinfo9
-rw-r--r--graphics/snx101view/patches/patch-aa16
-rw-r--r--graphics/snx101view/patches/patch-ab16
-rw-r--r--graphics/snx101view/patches/patch-ac16
-rw-r--r--graphics/snx101view/patches/patch-ad16
133 files changed, 1 insertions, 3630 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index b381f33a390..688e56140c1 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.587 2011/02/27 13:02:18 taca Exp $
+# $NetBSD: Makefile,v 1.588 2011/03/06 16:02:29 wiz Exp $
#
COMMENT= Graphics tools and libraries
@@ -116,7 +116,6 @@ SUBDIR+= freetype-utils
SUBDIR+= freetype2
SUBDIR+= fujiplay
SUBDIR+= g2
-SUBDIR+= g3d
SUBDIR+= gd
SUBDIR+= gdchart
SUBDIR+= gdk-pixbuf
@@ -133,7 +132,6 @@ SUBDIR+= gif320
SUBDIR+= giflib
SUBDIR+= gifsicle
SUBDIR+= giftrans
-SUBDIR+= gimageview
SUBDIR+= gimmage
SUBDIR+= gimp
SUBDIR+= gimp-color-manager
@@ -158,10 +156,7 @@ SUBDIR+= gimp-refocus-it
SUBDIR+= gimp-resynthesizer
SUBDIR+= gimp-ufraw
SUBDIR+= gimp-warp-sharp
-SUBDIR+= gimp1
SUBDIR+= gimp1-base
-SUBDIR+= gimp1-data
-SUBDIR+= gimp1-wideangle
SUBDIR+= gimp2-wideangle
SUBDIR+= giram
SUBDIR+= gle
@@ -181,7 +176,6 @@ SUBDIR+= gnuplot
SUBDIR+= gocr
SUBDIR+= goocanvas
SUBDIR+= goocanvasmm
-SUBDIR+= gphoto
SUBDIR+= gphoto2
SUBDIR+= gqview
SUBDIR+= gqview-devel
@@ -288,7 +282,6 @@ SUBDIR+= openexr
SUBDIR+= openjpeg
SUBDIR+= optipng
SUBDIR+= osg
-SUBDIR+= ov519view
SUBDIR+= oxygen-icons
SUBDIR+= p5-Barcode-Code128
SUBDIR+= p5-Chart
@@ -330,8 +323,6 @@ SUBDIR+= photopc
SUBDIR+= php-exif
SUBDIR+= php-gd
SUBDIR+= php-jpgraph
-SUBDIR+= phpsview
-SUBDIR+= pixieplus
SUBDIR+= pixmap
SUBDIR+= ploticus
SUBDIR+= ploticus-examples
@@ -341,10 +332,8 @@ SUBDIR+= png
SUBDIR+= png2html
SUBDIR+= pngcheck
SUBDIR+= pngcrush
-SUBDIR+= pornview
SUBDIR+= potrace
SUBDIR+= povray
-SUBDIR+= ppmtoxvpic
SUBDIR+= prag
SUBDIR+= ps2eps
SUBDIR+= pstoedit
@@ -368,7 +357,6 @@ SUBDIR+= py-piddle
SUBDIR+= py-pyfits
SUBDIR+= py-sk1libs
SUBDIR+= py-uniconvertor
-SUBDIR+= qcamview
SUBDIR+= qimageblitz
SUBDIR+= qiv
SUBDIR+= quesoglc
@@ -409,7 +397,6 @@ SUBDIR+= silgraphite-ft
SUBDIR+= silgraphite-xft
SUBDIR+= simage
SUBDIR+= skencil
-SUBDIR+= snx101view
SUBDIR+= spcaview
SUBDIR+= tango-icon-theme
SUBDIR+= tesseract
diff --git a/graphics/g3d/DESCR b/graphics/g3d/DESCR
deleted file mode 100644
index 54f617fad53..00000000000
--- a/graphics/g3d/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This is G3D. It is a 3D modeller with a narrow view of 3D modelling.
-That is: I wrote this up to make models for 3D games. This means that
-advanced modelling features (NURBS, animation, other stuff like that)
-is not included. It probably never will be either.
diff --git a/graphics/g3d/Makefile b/graphics/g3d/Makefile
deleted file mode 100644
index 465ae2e0b50..00000000000
--- a/graphics/g3d/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2009/07/22 09:01:31 wiz Exp $
-#
-
-DISTNAME= g3d-0.0.2
-PKGREVISION= 6
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= 3D modeller with a view of 3D modelling
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-WRKSRC= ${WRKDIR}/g3d
-USE_LIBTOOL= YES
-USE_TOOLS+= gmake
-USE_X11BASE= YES
-GNU_CONFIGURE= YES
-
-post-configure:
- @${LN} -s ${WRKSRC}/b3d/src ${WRKSRC}/g3d/b3d
-
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/gtkglarea/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/g3d/PLIST b/graphics/g3d/PLIST
deleted file mode 100644
index 9e9445ee93e..00000000000
--- a/graphics/g3d/PLIST
+++ /dev/null
@@ -1,25 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:59:12 joerg Exp $
-bin/g3d
-include/b3d/b3d.h
-include/b3d/btex.h
-include/b3d/geo.h
-include/b3d/global.h
-include/b3d/model.h
-include/b3d/sgi.h
-include/b3d/transform.h
-lib/libb3d.la
-share/pixmaps/g3d/exit.xpm
-share/pixmaps/g3d/file.xpm
-share/pixmaps/g3d/lineadd.xpm
-share/pixmaps/g3d/linesel.xpm
-share/pixmaps/g3d/linesub.xpm
-share/pixmaps/g3d/new.xpm
-share/pixmaps/g3d/pointadd.xpm
-share/pixmaps/g3d/pointsel.xpm
-share/pixmaps/g3d/pointsub.xpm
-share/pixmaps/g3d/right_arrow.xpm
-share/pixmaps/g3d/save.xpm
-share/pixmaps/g3d/triadd.xpm
-share/pixmaps/g3d/trisel.xpm
-share/pixmaps/g3d/trisub.xpm
-share/pixmaps/g3d/tritex.xpm
diff --git a/graphics/g3d/distinfo b/graphics/g3d/distinfo
deleted file mode 100644
index f6d67b1b0c1..00000000000
--- a/graphics/g3d/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2008/06/20 01:09:21 joerg Exp $
-
-SHA1 (g3d-0.0.2.tar.gz) = 43bee375f1c5053b89110eda505a9a9eca3fa697
-RMD160 (g3d-0.0.2.tar.gz) = 6ad8fdabe843a8cf5c8353a16e2ac2b9100701ce
-Size (g3d-0.0.2.tar.gz) = 187640 bytes
-SHA1 (patch-aa) = 26bb72b8de39c7038448b248474c2c753cf69120
-SHA1 (patch-ab) = 785a24c0b275235d6c7eb47ec2ca19823f4f528f
diff --git a/graphics/g3d/patches/patch-aa b/graphics/g3d/patches/patch-aa
deleted file mode 100644
index 3703b1fe776..00000000000
--- a/graphics/g3d/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:21 joerg Exp $
-
---- ./g3d/Makefile.in.orig Sat Jul 17 05:29:18 1999
-+++ ./g3d/Makefile.in Thu Jul 22 10:24:50 1999
-@@ -100,5 +100,5 @@
- l = @l@
-
--CFLAGS = @CFLAGS@ -Wall $(GTK_CFLAGS) -DPIXMAP_DIR=\"/usr/local/share/pixmaps/g3d/\"
-+CFLAGS = @CFLAGS@ -Wall $(GTK_CFLAGS) -DPIXMAP_DIR=\"$(prefix)/share/pixmaps/g3d/\"
-
- bin_PROGRAMS = g3d
-@@ -107,5 +107,5 @@
-
-
--g3d_LDADD = -lb3d $(GL_LIBS) $(GTK_LIBS) -lgtkgl
-+g3d_LDADD = ../b3d/src/libb3d.la $(GL_LIBS) $(GTK_LIBS) -lgtkgl
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
-@@ -370,6 +370,6 @@
-
- install-data-local:
-- -mkdir /usr/local/share/pixmaps/g3d/
-- cp $(top_srcdir)/pixmaps/*.xpm /usr/local/share/pixmaps/g3d/
-+ $(mkinstalldirs) ${DESTDIR}$(prefix)/share/pixmaps/g3d/
-+ cp $(top_srcdir)/pixmaps/*.xpm ${DESTDIR}$(prefix)/share/pixmaps/g3d/
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/graphics/g3d/patches/patch-ab b/graphics/g3d/patches/patch-ab
deleted file mode 100644
index 2ad6d03001a..00000000000
--- a/graphics/g3d/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/07/22 03:35:21 sakamoto Exp $
-
---- ./configure.orig Tue Jul 20 04:24:13 1999
-+++ ./configure Thu Jul 22 10:21:45 1999
-@@ -1348,6 +1348,7 @@
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL="$LIBTOOL"
-
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags=
-@@ -1392,4 +1393,5 @@
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-+fi
-
- # Redirect the config.log output again, so that the ltconfig log is not
diff --git a/graphics/gimageview/DESCR b/graphics/gimageview/DESCR
deleted file mode 100644
index 70dc9647acd..00000000000
--- a/graphics/gimageview/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-GImageView is a GTK+ based image viewer.
-
-It supports tabbed browsing, thumbnail table views, directory tree views,
-drag and drop, reading thumbnail cache of other famous image viewers,
-and has a flexible user interface.
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
deleted file mode 100644
index 21dfc0fda62..00000000000
--- a/graphics/gimageview/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.66 2011/02/01 08:50:31 wiz Exp $
-
-DISTNAME= gimageview-0.2.27
-PKGREVISION= 21
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://gtkmmviewer.sourceforge.net/
-COMMENT= GTK+ based image viewer with tabbed browsing
-LICENSE= gnu-gpl-v2
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_PKGLOCALEDIR= YES
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake intltool pkg-config
-
-CONFIGURE_ARGS+= --disable-xinetest
-CONFIGURE_ARGS+= --with-gtk2
-
-# The 'gimv' binary is not linked against libpthread directly, but the
-# librsvg library is. So, when the program tries to dlopen(3) it, it
-# causes a segfault due to NetBSD "limitations".
-LDFLAGS.NetBSD+= ${PTHREAD_LDFLAGS}
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../graphics/libwmf/buildlink3.mk"
-.include "../../graphics/mng/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimageview/PLIST b/graphics/gimageview/PLIST
deleted file mode 100644
index 1ec5c1d856d..00000000000
--- a/graphics/gimageview/PLIST
+++ /dev/null
@@ -1,121 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 20:05:41 joerg Exp $
-bin/gimv
-lib/gimageview/archiver/libgimv_lha_extarc.la
-lib/gimageview/archiver/libgimv_rar_extarc.la
-lib/gimageview/archiver/libgimv_tar_extarc.la
-lib/gimageview/archiver/libgimv_zip_extarc.la
-lib/gimageview/image_loader/libgimv_bmp_loader.la
-lib/gimageview/image_loader/libgimv_jpeg_loader.la
-lib/gimageview/image_loader/libgimv_mag_loader.la
-lib/gimageview/image_loader/libgimv_mng_loader.la
-lib/gimageview/image_loader/libgimv_pcx_loader.la
-lib/gimageview/image_loader/libgimv_pixbuf_loader.la
-lib/gimageview/image_loader/libgimv_png_loader.la
-lib/gimageview/image_loader/libgimv_rsvg_loader.la
-lib/gimageview/image_loader/libgimv_tga_loader.la
-lib/gimageview/image_loader/libgimv_wmf_loader.la
-lib/gimageview/image_loader/libgimv_xbm_loader.la
-lib/gimageview/image_loader/libgimv_xcf_loader.la
-lib/gimageview/image_loader/libgimv_xvpics_loader.la
-lib/gimageview/image_saver/libgimv_png_saver.la
-lib/gimageview/image_saver/libgimv_pnm_saver.la
-lib/gimageview/image_saver/libgimv_xvpics_saver.la
-lib/gimageview/io_stream/libgimv_bz_io.la
-lib/gimageview/io_stream/libgimv_gzip_io.la
-lib/gimageview/thumbnail/libgimv_ee_thumb.la
-lib/gimageview/thumbnail/libgimv_gqview_thumb.la
-lib/gimageview/thumbnail/libgimv_konq_old_thumb.la
-lib/gimageview/thumbnail/libgimv_konqueror_thumb.la
-lib/gimageview/thumbnail/libgimv_nautilus-2.0_thumb.la
-lib/gimageview/thumbnail/libgimv_nautilus_thumb.la
-lib/gimageview/thumbnail/libgimv_thumb.la
-lib/gimageview/thumbnail/libgimv_xvpics_thumb.la
-lib/gimageview/thumbnail_view/libgimv_thumbview_detail.la
-share/doc/gimageview/html/ja/01.html
-share/doc/gimageview/html/ja/02.html
-share/doc/gimageview/html/ja/03.html
-share/doc/gimageview/html/ja/04.html
-share/doc/gimageview/html/ja/05.html
-share/doc/gimageview/html/ja/06.html
-share/doc/gimageview/html/ja/07.html
-share/doc/gimageview/html/ja/changelog.html
-share/doc/gimageview/html/ja/document.html
-share/doc/gimageview/html/ja/gimageview.css
-share/doc/gimageview/html/ja/gimv_faq.html
-share/doc/gimageview/html/ja/gimv_history.html
-share/doc/gimageview/html/ja/gimv_tips.html
-share/doc/gimageview/html/ja/index.html
-share/doc/gimageview/html/ja/todo.html
-share/doc/gimageview/text/C/AUTHORS
-share/doc/gimageview/text/C/COPYING
-share/doc/gimageview/text/C/ChangeLog
-share/doc/gimageview/text/C/HACKING
-share/doc/gimageview/text/C/INSTALL
-share/doc/gimageview/text/C/NEWS
-share/doc/gimageview/text/C/README
-share/doc/gimageview/text/C/TODO
-share/doc/gimageview/text/ja/COPYING.ja
-share/doc/gimageview/text/ja/ChangeLog.ja
-share/doc/gimageview/text/ja/INSTALL.ja
-share/doc/gimageview/text/ja/NEWS.ja
-share/doc/gimageview/text/ja/README.ja
-share/doc/gimageview/text/ja/TODO.ja
-share/doc/gimageview/text/ja/gimageview.txt
-share/gimageview/gtkrc
-share/gimageview/mplayerrc
-share/gimageview/pixmaps/default/alert.xpm
-share/gimageview/pixmaps/default/archive.xpm
-share/gimageview/pixmaps/default/back.xpm
-share/gimageview/pixmaps/default/close.xpm
-share/gimageview/pixmaps/default/dotfile.xpm
-share/gimageview/pixmaps/default/eject.xpm
-share/gimageview/pixmaps/default/ff.xpm
-share/gimageview/pixmaps/default/folder-go.xpm
-share/gimageview/pixmaps/default/folder-link-open.xpm
-share/gimageview/pixmaps/default/folder-link.xpm
-share/gimageview/pixmaps/default/folder-lock.xpm
-share/gimageview/pixmaps/default/folder-open.xpm
-share/gimageview/pixmaps/default/folder-up.xpm
-share/gimageview/pixmaps/default/folder.xpm
-share/gimageview/pixmaps/default/folder48.xpm
-share/gimageview/pixmaps/default/forward.xpm
-share/gimageview/pixmaps/default/fullscreen.xpm
-share/gimageview/pixmaps/default/gimageview.xpm
-share/gimageview/pixmaps/default/gimv_icon.xpm
-share/gimageview/pixmaps/default/home.xpm
-share/gimageview/pixmaps/default/image.xpm
-share/gimageview/pixmaps/default/leftarrow.xpm
-share/gimageview/pixmaps/default/nav_button.xpm
-share/gimageview/pixmaps/default/next_t.xpm
-share/gimageview/pixmaps/default/nfolder.xpm
-share/gimageview/pixmaps/default/no_zoom.xpm
-share/gimageview/pixmaps/default/paper.xpm
-share/gimageview/pixmaps/default/pause.xpm
-share/gimageview/pixmaps/default/play.xpm
-share/gimageview/pixmaps/default/prefs.xpm
-share/gimageview/pixmaps/default/prev_t.xpm
-share/gimageview/pixmaps/default/question.xpm
-share/gimageview/pixmaps/default/refresh.xpm
-share/gimageview/pixmaps/default/resize.xpm
-share/gimageview/pixmaps/default/rightarrow.xpm
-share/gimageview/pixmaps/default/rotate.xpm
-share/gimageview/pixmaps/default/rw.xpm
-share/gimageview/pixmaps/default/search.xpm
-share/gimageview/pixmaps/default/skip.xpm
-share/gimageview/pixmaps/default/small_archive.xpm
-share/gimageview/pixmaps/default/small_close.xpm
-share/gimageview/pixmaps/default/small_home.xpm
-share/gimageview/pixmaps/default/small_refresh.xpm
-share/gimageview/pixmaps/default/small_up.xpm
-share/gimageview/pixmaps/default/stop.xpm
-share/gimageview/pixmaps/default/stop2.xpm
-share/gimageview/pixmaps/default/up.xpm
-share/gimageview/pixmaps/default/zoom.xpm
-share/gimageview/pixmaps/default/zoom_fit.xpm
-share/gimageview/pixmaps/default/zoom_in.xpm
-share/gimageview/pixmaps/default/zoom_out.xpm
-share/gnome/apps/Graphics/gimageview.desktop
-share/locale/fr/LC_MESSAGES/gimageview.mo
-share/locale/ja/LC_MESSAGES/gimageview.mo
-share/pixmaps/gimv.png
-@pkgdir lib/gimageview/image_view
diff --git a/graphics/gimageview/distinfo b/graphics/gimageview/distinfo
deleted file mode 100644
index b6ddaa28991..00000000000
--- a/graphics/gimageview/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.11 2011/02/14 18:12:24 wiz Exp $
-
-SHA1 (gimageview-0.2.27.tar.gz) = 333f0682e4f8f8ead4abb24f6eddf86f776c2478
-RMD160 (gimageview-0.2.27.tar.gz) = 1d35b3a1b453f87dc232b84407524c3011ec91eb
-Size (gimageview-0.2.27.tar.gz) = 1348286 bytes
-SHA1 (patch-aa) = 74fd28b7370022d4af2556b928d7695b3db67759
-SHA1 (patch-ab) = e5f18d3ae22e63d6c04fbc5e16c1846d5c687bde
-SHA1 (patch-ac) = 02446b9d3393a49804b2a61c725aeb027602b59d
-SHA1 (patch-ad) = f9f5345833f50e74f12f61c37a73aa9e77d7888d
-SHA1 (patch-ae) = e80ab5693424aad5578b6775af5c21857b69f8e2
-SHA1 (patch-af) = e1829e5903fc722a105df24b91461b4943e81506
-SHA1 (patch-ag) = bb80da9d6cbfd98f5a299e2e53e92a594b481688
-SHA1 (patch-ah) = 4ef03652127f442214bd0ad66fe125b75186502b
-SHA1 (patch-ai) = 78e70d580900095fb2c4887867399473306e63d3
-SHA1 (patch-aj) = 73ffb15d6451469ba1cc89d6b8918cecfbd24847
-SHA1 (patch-ak) = 7e8faa1712a5c4aeae2f12e64bb9c7ce415f17db
-SHA1 (patch-al) = cbd0c2ae2fdb096ddbf31dfbc747e25fe8c6311a
-SHA1 (patch-am) = e6e3b6e859b6de2ca7dc17fe714cea0e7fe542ef
-SHA1 (patch-plugins_image__loader_png__loader.c) = 985e2c36af5a982685692015051c354a420d51bf
-SHA1 (patch-plugins_image__saver_png__saver.c) = d05451da2acfe98d09048794d457f7726300d1e2
diff --git a/graphics/gimageview/patches/patch-aa b/graphics/gimageview/patches/patch-aa
deleted file mode 100644
index ae6d20d2d21..00000000000
--- a/graphics/gimageview/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/02/25 01:17:01 joerg Exp $
-
---- src/gimv_cell_pixmap.c.orig 2009-02-25 01:05:51.000000000 +0100
-+++ src/gimv_cell_pixmap.c
-@@ -25,10 +25,6 @@
- * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
- */
-
--#ifndef GTK_DISABLE_DEPRECATED
--# define GTK_DISABLE_DEPRECATED
--#endif /* GTK_DISABLE_DEPRECATED */
--
- #include "gimv_cell_pixmap.h"
-
- #if (GTK_MAJOR_VERSION >= 2)
diff --git a/graphics/gimageview/patches/patch-ab b/graphics/gimageview/patches/patch-ab
deleted file mode 100644
index 832d73bb9a1..00000000000
--- a/graphics/gimageview/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- src/auto_completion.c.orig 2009-02-25 01:33:28.000000000 +0100
-+++ src/auto_completion.c
-@@ -36,7 +36,6 @@
- #include <gdk/gdkkeysyms.h>
- #include <gtk/gtkentry.h>
- #include <gtk/gtkframe.h>
--#include <gtk/gtkclist.h>
- #include <gtk/gtkmain.h>
- #include <gtk/gtkwindow.h>
- #include <gtk/gtkscrolledwindow.h>
diff --git a/graphics/gimageview/patches/patch-ac b/graphics/gimageview/patches/patch-ac
deleted file mode 100644
index 994c020d593..00000000000
--- a/graphics/gimageview/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- plugins/archiver/Makefile.in.orig 2009-02-25 01:53:13.000000000 +0100
-+++ plugins/archiver/Makefile.in
-@@ -346,7 +346,7 @@ archiver_plugin_LTLIBRARIES = \
- libgimv_tar_extarc.la \
- libgimv_zip_extarc.la
-
--archiver_plugindir = $(DESTDIR)$(plugindir)/$(ARCHIVER_PLUGIN_DIR)
-+archiver_plugindir = $(plugindir)/$(ARCHIVER_PLUGIN_DIR)
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(GTK_CFLAGS)
- libgimv_lha_extarc_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS)
- libgimv_lha_extarc_la_SOURCES = lha-ext.c lha-ext.h
diff --git a/graphics/gimageview/patches/patch-ad b/graphics/gimageview/patches/patch-ad
deleted file mode 100644
index 4bb9aba0124..00000000000
--- a/graphics/gimageview/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- plugins/image_loader/Makefile.in.orig 2009-02-25 01:52:40.000000000 +0100
-+++ plugins/image_loader/Makefile.in
-@@ -450,14 +450,14 @@ image_loader_plugin_LTLIBRARIES = \
- @ENABLE_SPI_TRUE@gimv_spi_loader_plugin_LTLIBRARIES = libgimv_spi_loader.la
- @ENABLE_LIBRSVG_TRUE@gimv_rsvg_loader_plugin_LTLIBRARIES = libgimv_rsvg_loader.la
- @ENABLE_WMF_TRUE@gimv_wmf_loader_plugin_LTLIBRARIES = libgimv_wmf_loader.la
--image_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
--gimv_imlib1_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
--gimv_jpeg_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
--gimv_mng_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
--gimv_pixbuf_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
--gimv_spi_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
--gimv_rsvg_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
--gimv_wmf_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
-+image_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
-+gimv_imlib1_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
-+gimv_jpeg_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
-+gimv_mng_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
-+gimv_pixbuf_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
-+gimv_spi_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
-+gimv_rsvg_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
-+gimv_wmf_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR)
- INCLUDES = \
- $(GTK_CFLAGS) \
- $(GIMV_IMAGELIB_CFLAGS) \
diff --git a/graphics/gimageview/patches/patch-ae b/graphics/gimageview/patches/patch-ae
deleted file mode 100644
index 8b1d282cded..00000000000
--- a/graphics/gimageview/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- plugins/image_saver/Makefile.in.orig 2009-02-25 01:53:42.000000000 +0100
-+++ plugins/image_saver/Makefile.in
-@@ -342,7 +342,7 @@ image_saver_plugin_LTLIBRARIES = \
- libgimv_pnm_saver.la \
- libgimv_xvpics_saver.la
-
--image_saver_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_SAVER_PLUGIN_DIR)
-+image_saver_plugindir = $(plugindir)/$(IMAGE_SAVER_PLUGIN_DIR)
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(GTK_CFLAGS)
- libgimv_png_saver_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS)
- libgimv_png_saver_la_SOURCES = png_saver.c
diff --git a/graphics/gimageview/patches/patch-af b/graphics/gimageview/patches/patch-af
deleted file mode 100644
index a25d06311d7..00000000000
--- a/graphics/gimageview/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- plugins/image_view/Makefile.in.orig 2009-02-25 01:54:27.000000000 +0100
-+++ plugins/image_view/Makefile.in
-@@ -347,8 +347,8 @@ target_alias = @target_alias@
- CLEANFILES = *~ .deps/* .*.swp .*.swo
- @ENABLE_MPLAYER_TRUE@gimv_mplayer_plugin_LTLIBRARIES = libgimv_mplayer.la
- @ENABLE_XINE_TRUE@gimv_xine_plugin_LTLIBRARIES = libgimv_xine.la
--gimv_mplayer_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_VIEW_PLUGIN_DIR)
--gimv_xine_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_VIEW_PLUGIN_DIR)
-+gimv_mplayer_plugindir = $(plugindir)/$(IMAGE_VIEW_PLUGIN_DIR)
-+gimv_xine_plugindir = $(plugindir)/$(IMAGE_VIEW_PLUGIN_DIR)
- INCLUDES = \
- $(GTK_CFLAGS) \
- $(XINE_CFLAGS) \
diff --git a/graphics/gimageview/patches/patch-ag b/graphics/gimageview/patches/patch-ag
deleted file mode 100644
index 76ed01bbfce..00000000000
--- a/graphics/gimageview/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- plugins/io_stream/Makefile.in.orig 2009-02-25 01:55:01.000000000 +0100
-+++ plugins/io_stream/Makefile.in
-@@ -337,8 +337,8 @@ io_stream_plugin_LTLIBRARIES = \
- libgimv_gzip_io.la
-
- @HAVE_BZLIB_TRUE@gimv_bz_io_plugin_LTLIBRARIES = libgimv_bz_io.la
--io_stream_plugindir = $(DESTDIR)$(plugindir)/$(IO_STREAM_PLUGIN_DIR)
--gimv_bz_io_plugindir = $(DESTDIR)$(plugindir)/$(IO_STREAM_PLUGIN_DIR)
-+io_stream_plugindir = $(plugindir)/$(IO_STREAM_PLUGIN_DIR)
-+gimv_bz_io_plugindir = $(plugindir)/$(IO_STREAM_PLUGIN_DIR)
- INCLUDES = \
- $(GTK_CFLAGS) \
- $(ZLIB_CLAGS) \
diff --git a/graphics/gimageview/patches/patch-ah b/graphics/gimageview/patches/patch-ah
deleted file mode 100644
index 209dbd55803..00000000000
--- a/graphics/gimageview/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- plugins/thumbnail/Makefile.in.orig 2009-02-25 01:55:31.000000000 +0100
-+++ plugins/thumbnail/Makefile.in
-@@ -377,7 +377,7 @@ thumbnail_plugin_LTLIBRARIES = \
- libgimv_ee_thumb.la \
- libgimv_xvpics_thumb.la
-
--thumbnail_plugindir = $(DESTDIR)$(plugindir)/$(THUMBNAIL_PLUGIN_DIR)
-+thumbnail_plugindir = $(plugindir)/$(THUMBNAIL_PLUGIN_DIR)
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(GTK_CFLAGS)
- libgimv_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS)
- libgimv_thumb_la_SOURCES = gimv_thumb.c
diff --git a/graphics/gimageview/patches/patch-ai b/graphics/gimageview/patches/patch-ai
deleted file mode 100644
index 47038203e06..00000000000
--- a/graphics/gimageview/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- plugins/thumbnail_view/Makefile.in.orig 2009-02-25 01:56:07.000000000 +0100
-+++ plugins/thumbnail_view/Makefile.in
-@@ -330,7 +330,7 @@ target_alias = @target_alias@
- thumbview_plugin_LTLIBRARIES = \
- libgimv_thumbview_detail.la
-
--thumbview_plugindir = $(DESTDIR)$(plugindir)/$(THUMBNAIL_VIEW_PLUGIN_DIR)
-+thumbview_plugindir = $(plugindir)/$(THUMBNAIL_VIEW_PLUGIN_DIR)
- INCLUDES = \
- $(GTK_CFLAGS) \
- -I$(top_srcdir) \
diff --git a/graphics/gimageview/patches/patch-aj b/graphics/gimageview/patches/patch-aj
deleted file mode 100644
index b42c820e7f3..00000000000
--- a/graphics/gimageview/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- src/pixmaps/Makefile.in.orig 2009-02-25 01:56:58.000000000 +0100
-+++ src/pixmaps/Makefile.in
-@@ -299,7 +299,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--default_icondir = $(DESTDIR)$(gimv_icondir)/default
-+default_icondir = $(gimv_icondir)/default
- default_icon_DATA = \
- alert.xpm \
- archive.xpm \
diff --git a/graphics/gimageview/patches/patch-ak b/graphics/gimageview/patches/patch-ak
deleted file mode 100644
index aa4a6c514f6..00000000000
--- a/graphics/gimageview/patches/patch-ak
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- etc/Makefile.in.orig 2009-02-25 01:57:20.000000000 +0100
-+++ etc/Makefile.in
-@@ -304,17 +304,17 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--desktopdir = $(DESTDIR)$(datadir)/gnome/apps/Graphics
-+desktopdir = $(datadir)/gnome/apps/Graphics
- desktop_in_files = gimageview.desktop.in
- #desktop_DATA = gimageview.desktop
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- icondir = $(datadir)/pixmaps
- icon_DATA = gimv.png
--prefsdir = $(DESTDIR)$(gimv_datadir)
-+prefsdir = $(gimv_datadir)
- prefs_DATA = \
- gtkrc
-
--mplayerrcdir = $(DESTDIR)$(gimv_datadir)
-+mplayerrcdir = $(gimv_datadir)
- mplayerrc_DATA = \
- mplayerrc
-
diff --git a/graphics/gimageview/patches/patch-al b/graphics/gimageview/patches/patch-al
deleted file mode 100644
index fc21cd2ca03..00000000000
--- a/graphics/gimageview/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- doc/ja/Makefile.in.orig 2009-02-25 01:57:50.000000000 +0100
-+++ doc/ja/Makefile.in
-@@ -300,7 +300,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--jahtmldir = $(DESTDIR)$(gimv_docdir)/html/ja
-+jahtmldir = $(gimv_docdir)/html/ja
- jahtml_DATA = \
- gimageview.css \
- index.html \
-@@ -318,7 +318,7 @@ jahtml_DATA = \
- document.html \
- changelog.html
-
--jatextdir = $(DESTDIR)$(gimv_docdir)/text/ja
-+jatextdir = $(gimv_docdir)/text/ja
- jatext_DATA = \
- COPYING.ja \
- ChangeLog.ja \
diff --git a/graphics/gimageview/patches/patch-am b/graphics/gimageview/patches/patch-am
deleted file mode 100644
index bafba11ca6d..00000000000
--- a/graphics/gimageview/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2009/02/25 01:17:01 joerg Exp $
-
---- Makefile.in.orig 2009-02-25 02:09:45.000000000 +0100
-+++ Makefile.in
-@@ -329,7 +329,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = doc etc m4 po intl lib src plugins
- CLEANFILES = *~ .deps/* .*.swp .*.swo
--endocdir = $(DESTDIR)$(gimv_docdir)/text/C
-+endocdir = $(gimv_docdir)/text/C
- endoc_DATA = \
- AUTHORS \
- COPYING \
diff --git a/graphics/gimageview/patches/patch-plugins_image__loader_png__loader.c b/graphics/gimageview/patches/patch-plugins_image__loader_png__loader.c
deleted file mode 100644
index 4bccf630468..00000000000
--- a/graphics/gimageview/patches/patch-plugins_image__loader_png__loader.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-plugins_image__loader_png__loader.c,v 1.2 2011/02/14 18:12:24 wiz Exp $
-
-Fix build with png-1.5.
-https://sourceforge.net/tracker/?func=detail&aid=3181113&group_id=39083&atid=424297
-
---- plugins/image_loader/png_loader.c.orig 2004-05-23 14:08:16.000000000 +0000
-+++ plugins/image_loader/png_loader.c
-@@ -255,7 +255,7 @@ gimv_png_load (GimvImageLoader *loader,
- return NULL;
- }
-
-- if (setjmp (png_ptr->jmpbuf)) goto ERROR;
-+ if (setjmp (png_jmpbuf(png_ptr))) goto ERROR;
-
- context.gio = gio;
- context.bytes_read = 0;
diff --git a/graphics/gimageview/patches/patch-plugins_image__saver_png__saver.c b/graphics/gimageview/patches/patch-plugins_image__saver_png__saver.c
deleted file mode 100644
index 2aa6068f133..00000000000
--- a/graphics/gimageview/patches/patch-plugins_image__saver_png__saver.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-plugins_image__saver_png__saver.c,v 1.2 2011/02/14 18:12:24 wiz Exp $
-
-Fix build with png-1.5.
-https://sourceforge.net/tracker/?func=detail&aid=3181113&group_id=39083&atid=424297
-
---- plugins/image_saver/png_saver.c.orig 2004-05-23 14:08:11.000000000 +0000
-+++ plugins/image_saver/png_saver.c
-@@ -130,7 +130,7 @@ save_png (GimvImageSaver *saver,
- return FALSE;
- }
-
-- if (setjmp (png_ptr->jmpbuf)) {
-+ if (setjmp (png_jmpbuf(png_ptr))) {
- png_destroy_write_struct (&png_ptr, &info_ptr);
- fclose (handle);
- return FALSE;
diff --git a/graphics/gimp1-data/DESCR b/graphics/gimp1-data/DESCR
deleted file mode 100644
index d13befee700..00000000000
--- a/graphics/gimp1-data/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Powerful image manipulation program similar to "Adobe Photoshop"[tm].
-It supports layers, arbitrary image sizes and working on several images at the
-same time. It comes with a lot of useful plug-ins. Missing is CMYK support and
-more than 8 bits per channel.
diff --git a/graphics/gimp1-data/Makefile b/graphics/gimp1-data/Makefile
deleted file mode 100644
index dccb9fd70ae..00000000000
--- a/graphics/gimp1-data/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2011/01/13 13:38:04 wiz Exp $
-#
-
-DISTNAME= gimp-data-extras-1.2.0
-PKGNAME= gimp-data-1.2
-PKGREVISION= 11
-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/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gimp.org/
-COMMENT= GNU Image Manipulation Program (extra brushes and patterns)
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-CONFLICTS+= gimp<=1.2.3 gimp>=2.0.0
-
-GNU_CONFIGURE= YES
-
-.include "../../graphics/gimp1-base/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp1-data/PLIST b/graphics/gimp1-data/PLIST
deleted file mode 100644
index 2f0fa92a277..00000000000
--- a/graphics/gimp1-data/PLIST
+++ /dev/null
@@ -1,152 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/29 22:07:35 xtraeme Exp $
-share/gimp/1.2/brushes/50x50cone.gbr
-share/gimp/1.2/brushes/50x50square.gbr
-share/gimp/1.2/brushes/50x50squareBlur.gbr
-share/gimp/1.2/brushes/50x50squareBlur2.gbr
-share/gimp/1.2/brushes/bigcircle.gbr
-share/gimp/1.2/brushes/bigcircle2.gbr
-share/gimp/1.2/brushes/bigcircle3.gbr
-share/gimp/1.2/brushes/bigcircle4.gbr
-share/gimp/1.2/brushes/bird.gbr
-share/gimp/1.2/brushes/bullethole.gbr
-share/gimp/1.2/brushes/cloth.gbr
-share/gimp/1.2/brushes/flower.gbr
-share/gimp/1.2/brushes/flower_large.gbr
-share/gimp/1.2/brushes/gecko.gbr
-share/gimp/1.2/brushes/grid.gbr
-share/gimp/1.2/brushes/grid2.gbr
-share/gimp/1.2/brushes/guitar.gbr
-share/gimp/1.2/brushes/nova.gbr
-share/gimp/1.2/brushes/point.gbr
-share/gimp/1.2/brushes/punch.gbr
-share/gimp/1.2/brushes/qbert2.gbr
-share/gimp/1.2/brushes/qbert3Blur.gbr
-share/gimp/1.2/brushes/reach.gbr
-share/gimp/1.2/brushes/sphere29.gbr
-share/gimp/1.2/brushes/sphere36.gbr
-share/gimp/1.2/brushes/sphere47.gbr
-share/gimp/1.2/brushes/sphere55.gbr
-share/gimp/1.2/brushes/sphere79.gbr
-share/gimp/1.2/brushes/star1.gbr
-share/gimp/1.2/brushes/star2.gbr
-share/gimp/1.2/brushes/star3.gbr
-share/gimp/1.2/brushes/star4.gbr
-share/gimp/1.2/brushes/star5.gbr
-share/gimp/1.2/brushes/swirl.gbr
-share/gimp/1.2/brushes/swirl2.gbr
-share/gimp/1.2/brushes/text1.gbr
-share/gimp/1.2/brushes/text2.gbr
-share/gimp/1.2/brushes/text3.gbr
-share/gimp/1.2/brushes/text4.gbr
-share/gimp/1.2/brushes/tulip.gbr
-share/gimp/1.2/brushes/wave.gbr
-share/gimp/1.2/patterns/3dweave.pat
-share/gimp/1.2/patterns/abstract_flowers.pat
-share/gimp/1.2/patterns/blackoil.pat
-share/gimp/1.2/patterns/blackwhitefloor.pat
-share/gimp/1.2/patterns/blob1.pat
-share/gimp/1.2/patterns/blob2.pat
-share/gimp/1.2/patterns/bluebar.pat
-share/gimp/1.2/patterns/bluecanyons.pat
-share/gimp/1.2/patterns/bluemars.pat
-share/gimp/1.2/patterns/bluemetal.pat
-share/gimp/1.2/patterns/bluespikes.pat
-share/gimp/1.2/patterns/brownie.pat
-share/gimp/1.2/patterns/bwcubes.pat
-share/gimp/1.2/patterns/canyons2.pat
-share/gimp/1.2/patterns/cashew.pat
-share/gimp/1.2/patterns/chains.pat
-share/gimp/1.2/patterns/chroma.pat
-share/gimp/1.2/patterns/circuit.pat
-share/gimp/1.2/patterns/clouds.pat
-share/gimp/1.2/patterns/clovers.pat
-share/gimp/1.2/patterns/coins.pat
-share/gimp/1.2/patterns/colorblob.pat
-share/gimp/1.2/patterns/colored_rock.pat
-share/gimp/1.2/patterns/colorwhirl.pat
-share/gimp/1.2/patterns/connestoga.pat
-share/gimp/1.2/patterns/contrawhirl.pat
-share/gimp/1.2/patterns/cow.pat
-share/gimp/1.2/patterns/crash1.pat
-share/gimp/1.2/patterns/crazytile.pat
-share/gimp/1.2/patterns/crystals.pat
-share/gimp/1.2/patterns/curvedledge.pat
-share/gimp/1.2/patterns/deepswirl.pat
-share/gimp/1.2/patterns/diffpat.pat
-share/gimp/1.2/patterns/dirt.pat
-share/gimp/1.2/patterns/disco.pat
-share/gimp/1.2/patterns/drymud.pat
-share/gimp/1.2/patterns/dunemaze.pat
-share/gimp/1.2/patterns/dunes.pat
-share/gimp/1.2/patterns/eggcarton.pat
-share/gimp/1.2/patterns/electric-blue-ribbons.pat
-share/gimp/1.2/patterns/etbf.pat
-share/gimp/1.2/patterns/floor_tile.pat
-share/gimp/1.2/patterns/funnyblobs.pat
-share/gimp/1.2/patterns/funnymess.pat
-share/gimp/1.2/patterns/funnymess2.pat
-share/gimp/1.2/patterns/fuzzy-colors.pat
-share/gimp/1.2/patterns/gold.pat
-share/gimp/1.2/patterns/goldcloth.pat
-share/gimp/1.2/patterns/granite2.pat
-share/gimp/1.2/patterns/green_curtains.pat
-share/gimp/1.2/patterns/green_eek.pat
-share/gimp/1.2/patterns/greyweave.pat
-share/gimp/1.2/patterns/greyweave2.pat
-share/gimp/1.2/patterns/grid.pat
-share/gimp/1.2/patterns/gridwhirltile.pat
-share/gimp/1.2/patterns/headache.pat
-share/gimp/1.2/patterns/ice2.pat
-share/gimp/1.2/patterns/icechex.pat
-share/gimp/1.2/patterns/inlay.pat
-share/gimp/1.2/patterns/krinkle.pat
-share/gimp/1.2/patterns/land1.pat
-share/gimp/1.2/patterns/land2.pat
-share/gimp/1.2/patterns/lathe.pat
-share/gimp/1.2/patterns/leaves3.pat
-share/gimp/1.2/patterns/leaves4.pat
-share/gimp/1.2/patterns/leaves6.pat
-share/gimp/1.2/patterns/lumps.pat
-share/gimp/1.2/patterns/meltedcolors.pat
-share/gimp/1.2/patterns/metallica.pat
-share/gimp/1.2/patterns/metalpaths.pat
-share/gimp/1.2/patterns/mhuerock.pat
-share/gimp/1.2/patterns/money.pat
-share/gimp/1.2/patterns/neurons.pat
-share/gimp/1.2/patterns/novaugh.pat
-share/gimp/1.2/patterns/oooh.pat
-share/gimp/1.2/patterns/oooh3.pat
-share/gimp/1.2/patterns/orange_eek.pat
-share/gimp/1.2/patterns/orangebrown.pat
-share/gimp/1.2/patterns/orangecheese.pat
-share/gimp/1.2/patterns/paint-explosion.pat
-share/gimp/1.2/patterns/pastel2.pat
-share/gimp/1.2/patterns/pebbles.pat
-share/gimp/1.2/patterns/pixeled1.pat
-share/gimp/1.2/patterns/pj.pat
-share/gimp/1.2/patterns/psycho1.pat
-share/gimp/1.2/patterns/purple-ribbons.pat
-share/gimp/1.2/patterns/purple.pat
-share/gimp/1.2/patterns/purple_glow.pat
-share/gimp/1.2/patterns/redishstuff.pat
-share/gimp/1.2/patterns/redmess.pat
-share/gimp/1.2/patterns/redrings.pat
-share/gimp/1.2/patterns/rust.pat
-share/gimp/1.2/patterns/sandytext.pat
-share/gimp/1.2/patterns/send1.pat
-share/gimp/1.2/patterns/silver.pat
-share/gimp/1.2/patterns/slice1.pat
-share/gimp/1.2/patterns/spectbar.pat
-share/gimp/1.2/patterns/startile.pat
-share/gimp/1.2/patterns/swirl.pat
-share/gimp/1.2/patterns/swirl2.pat
-share/gimp/1.2/patterns/torrents.pat
-share/gimp/1.2/patterns/tube.pat
-share/gimp/1.2/patterns/unsharpswirl.pat
-share/gimp/1.2/patterns/water3.pat
-share/gimp/1.2/patterns/waves.pat
-share/gimp/1.2/patterns/wax.pat
-share/gimp/1.2/patterns/weird2.pat
-share/gimp/1.2/patterns/whirledstuff.pat
-share/gimp/1.2/patterns/woodblind.pat
-share/gimp/1.2/patterns/worn_metal_chex.pat
diff --git a/graphics/gimp1-data/distinfo b/graphics/gimp1-data/distinfo
deleted file mode 100644
index 9a574de2366..00000000000
--- a/graphics/gimp1-data/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 08:45:06 agc Exp $
-
-SHA1 (gimp-data-extras-1.2.0.tar.bz2) = 93e966544a4f507e2b9045e0cc0745bd0ae1ee81
-RMD160 (gimp-data-extras-1.2.0.tar.bz2) = 03273bbd2a32608623ba238b50575b8024b97a90
-Size (gimp-data-extras-1.2.0.tar.bz2) = 4432926 bytes
diff --git a/graphics/gimp1-wideangle/DESCR b/graphics/gimp1-wideangle/DESCR
deleted file mode 100644
index 2a9fe5b7c0f..00000000000
--- a/graphics/gimp1-wideangle/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-The wideangle filter is used to correct (or simulate) the distortion
-typically seen on photographs taken with a wideangle lens.
diff --git a/graphics/gimp1-wideangle/Makefile b/graphics/gimp1-wideangle/Makefile
deleted file mode 100644
index f78d55b7904..00000000000
--- a/graphics/gimp1-wideangle/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2011/01/13 13:38:04 wiz Exp $
-#
-
-DISTNAME= wideangleFeb03
-PKGNAME= gimp-wideangle-0.4
-PKGREVISION= 9
-CATEGORIES= graphics
-MASTER_SITES= http://members.ozemail.com.au/~hodsond/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://members.ozemail.com.au/~hodsond/
-COMMENT= GIMP plugin for wideangle lens distortions
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-WRKSRC= ${WRKDIR}/wideangle
-USE_TOOLS+= gmake pkg-config
-
-BUILD_TARGET= wideangle
-INSTALLATION_DIRS+= lib/gimp/1.2/plug-ins
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/wideangle ${DESTDIR}${PREFIX}/lib/gimp/1.2/plug-ins
-
-.include "../../graphics/gimp1-base/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp1-wideangle/PLIST b/graphics/gimp1-wideangle/PLIST
deleted file mode 100644
index f8574d9842d..00000000000
--- a/graphics/gimp1-wideangle/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/29 22:08:16 xtraeme Exp $
-lib/gimp/1.2/plug-ins/wideangle
diff --git a/graphics/gimp1-wideangle/distinfo b/graphics/gimp1-wideangle/distinfo
deleted file mode 100644
index 109a9eb314a..00000000000
--- a/graphics/gimp1-wideangle/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 08:45:06 agc Exp $
-
-SHA1 (wideangleFeb03.tgz) = 94020fd8910e4d621c6b214b2c077d7d203922a2
-RMD160 (wideangleFeb03.tgz) = 8fcab9ff90dde6ceb43008fc7900490953100190
-Size (wideangleFeb03.tgz) = 11286 bytes
diff --git a/graphics/gimp1/DESCR b/graphics/gimp1/DESCR
deleted file mode 100644
index d13befee700..00000000000
--- a/graphics/gimp1/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Powerful image manipulation program similar to "Adobe Photoshop"[tm].
-It supports layers, arbitrary image sizes and working on several images at the
-same time. It comes with a lot of useful plug-ins. Missing is CMYK support and
-more than 8 bits per channel.
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
deleted file mode 100644
index 7f6d4f3651d..00000000000
--- a/graphics/gimp1/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2008/06/20 00:15:35 joerg Exp $
-#
-
-DISTNAME= gimp-1.2.5
-PKGREVISION= 1
-CATEGORIES= graphics
-MASTER_SITES= # none
-DISTFILES= # none
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gimp.org/
-COMMENT= GNU Image Manipulation Program
-
-META_PACKAGE= yes
-
-DEPENDS+= gimp-base>=1.2.5:../../graphics/gimp1-base
-DEPENDS+= gimp-data>=1.2:../../graphics/gimp1-data
-DEPENDS+= gimp-print>=4.2.0:../../print/gimp-print
-DEPENDS+= gimp-print-escputil>=4.2.0:../../print/gimp-print-escputil
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gphoto/DESCR b/graphics/gphoto/DESCR
deleted file mode 100644
index 70cb4196a2e..00000000000
--- a/graphics/gphoto/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-gPhoto is an universal, free GTK+ application that will allow
-downloading, saving, and manipulation of images from several
-different digital camera models, or from the local harddrive.
-
-gPhoto has a basic command line interface, which is handy,
-if you want to set up a web camera, and use gphoto in a
-script, e.g. with Perl/PHP.
-
-gPhoto sports a new HTML engine, that let's you create your
-gallery "themes" (HTML with special tags), and publish images
-to the web. A directory browse mode has also been implemented.
-
-gPhoto supports a wide array of digital camera models.
-Visit http://www.gphoto.org/cameras.html for an updated list.
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
deleted file mode 100644
index 18a9e0b994b..00000000000
--- a/graphics/gphoto/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.35 2011/02/19 09:02:06 markd Exp $
-
-DISTNAME= gphoto-0.4.3
-PKGREVISION= 14
-CATEGORIES= graphics
-#MASTER_SITES= http://www.gphoto.net/dist/
-
-MAINTAINER= jmcm@cs.cmu.edu
-HOMEPAGE= http://www.gphoto.org/
-COMMENT= Download and view files from various digital cameras
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-MAKE_JOBS_SAFE= no
-
-USE_X11BASE= YES
-USE_LIBTOOL= YES
-GNU_CONFIGURE= yes
-
-.include "../../graphics/imlib-gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gphoto/PLIST b/graphics/gphoto/PLIST
deleted file mode 100644
index 96cfda94e3f..00000000000
--- a/graphics/gphoto/PLIST
+++ /dev/null
@@ -1,53 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:16 joerg Exp $
-bin/dc21x_cam
-bin/gphoto
-bin/gphoto-exifdump
-bin/qm100
-bin/qmxxx
-bin/rsony
-lib/libgphoto_canon.la
-lib/libgphoto_casio_qv.la
-lib/libgphoto_coolpix600.la
-lib/libgphoto_dimage_v.la
-lib/libgphoto_dir.la
-lib/libgphoto_fuji.la
-lib/libgphoto_kodak_dc2x.la
-lib/libgphoto_kodak_generic.la
-lib/libgphoto_konica_qm100.la
-lib/libgphoto_konica_qmxxx.la
-lib/libgphoto_mustek_mdc800.la
-lib/libgphoto_philips.la
-lib/libgphoto_photopc.la
-lib/libgphoto_ricoh300z.la
-lib/libgphoto_samsung.la
-lib/libgphoto_sony_dscf1.la
-lib/libgphoto_sony_dscf55.la
-man/man1/gphoto.1
-share/gnome/apps/Graphics/gphoto.desktop
-share/gphoto/doc/AUTHORS
-share/gphoto/doc/MANUAL
-share/gphoto/gallery/CSStheme/gphotobutton.png
-share/gphoto/gallery/CSStheme/index_bottom.html
-share/gphoto/gallery/CSStheme/index_top.html
-share/gphoto/gallery/CSStheme/mwcos.png
-share/gphoto/gallery/CSStheme/picture.html
-share/gphoto/gallery/CSStheme/styles.css
-share/gphoto/gallery/CSStheme/thumbnail.html
-share/gphoto/gallery/CSStheme/vh40.png
-share/gphoto/gallery/Default/banner.gif
-share/gphoto/gallery/Default/index.gif
-share/gphoto/gallery/Default/index_bottom.html
-share/gphoto/gallery/Default/index_top.html
-share/gphoto/gallery/Default/next.gif
-share/gphoto/gallery/Default/picture.html
-share/gphoto/gallery/Default/previous.gif
-share/gphoto/gallery/Default/thumbnail.html
-share/gphoto/gallery/RedNGray/backgrnd.gif
-share/gphoto/gallery/RedNGray/banner.gif
-share/gphoto/gallery/RedNGray/index.gif
-share/gphoto/gallery/RedNGray/index_bottom.html
-share/gphoto/gallery/RedNGray/index_top.html
-share/gphoto/gallery/RedNGray/next.gif
-share/gphoto/gallery/RedNGray/picture.html
-share/gphoto/gallery/RedNGray/previous.gif
-share/gphoto/gallery/RedNGray/thumbnail.html
diff --git a/graphics/gphoto/distinfo b/graphics/gphoto/distinfo
deleted file mode 100644
index b1a37346f5d..00000000000
--- a/graphics/gphoto/distinfo
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: distinfo,v 1.7 2007/08/08 19:41:30 joerg Exp $
-
-SHA1 (gphoto-0.4.3.tar.gz) = f0606444ca0b3c37065b022cbe28ae265704af39
-RMD160 (gphoto-0.4.3.tar.gz) = b0cefdea55b592e237a0787689255c2939180608
-Size (gphoto-0.4.3.tar.gz) = 709336 bytes
-SHA1 (patch-aa) = e058276c0a63972daf3dc127005c26114ca42f8c
-SHA1 (patch-ab) = f1cfb8c078a7ba2de3e15cdfe6b2cac197f5ed8a
-SHA1 (patch-ac) = e115b685d176f032ab6d85f63982b7bdf9496138
-SHA1 (patch-ad) = 575c36f042edeb22751f6cf7d6a57abd4b1ef813
-SHA1 (patch-ae) = 35f5286f36759f533ddf0301ae263eca5589c7c3
-SHA1 (patch-af) = 0d2614d84550d459c68914b068e89b7f06ce66ca
-SHA1 (patch-ai) = 4f049409172a9c327e5bdf1d275863dc115a6c80
-SHA1 (patch-ao) = 752aef4f1ca6d4ca20b7d88688d7de3ab27137d2
-SHA1 (patch-ap) = bf5f5f42216bd47d2fdfaf0f8c28c9b4bf775cd9
-SHA1 (patch-aq) = f31567b62da9c1616563819bb14af448bfcfb01a
-SHA1 (patch-ar) = 4480452473fe430b50b125305b02301e039ae58a
-SHA1 (patch-as) = f738f3f4ac38483580f32ad7b2b03a17123d360d
-SHA1 (patch-at) = 24b00b79ecdd0ee87baf0ee6215d21df393f26c0
-SHA1 (patch-au) = 0e76f6de4ac44dd19e1be8bf8bd27d12f383ccd4
-SHA1 (patch-av) = 2c4aaa7b7f73829880be3c0b7f2bae40370c7ad8
-SHA1 (patch-aw) = f896c6774c04e60419dc81847412dae9286216f7
-SHA1 (patch-ax) = d52694837311a05d310280a11497e13ad8648229
-SHA1 (patch-ay) = 31bed2ab061434fd28ffeda727babfd17f1bbe6e
-SHA1 (patch-az) = 0a4bc130750db709a5f4d808453f44ae20028e81
-SHA1 (patch-ba) = 61ead767f4f2ec2f61218d28127c29e29e97f4f5
-SHA1 (patch-bb) = bd3829f614d9400a68cda92b3d5afb538729c1f9
diff --git a/graphics/gphoto/patches/patch-aa b/graphics/gphoto/patches/patch-aa
deleted file mode 100644
index 2b313b81f38..00000000000
--- a/graphics/gphoto/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/05/12 12:26:58 joerg Exp $
-
---- canon/serial.c.orig 2006-05-06 12:21:45.000000000 +0000
-+++ canon/serial.c
-@@ -121,7 +121,7 @@ int canon_serial_init(const char *devnam
-
- D(printf("canon_init_serial(): devname %s\n", devname));
-
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || (defined(__DragonFly__) && !defined(O_SYNC))
- fd = open(devname, O_RDWR | O_NOCTTY | O_NONBLOCK);
- #else
- fd = open(devname, O_RDWR | O_NOCTTY | O_SYNC | O_NONBLOCK);
-@@ -143,7 +143,7 @@ int canon_serial_init(const char *devnam
- newtio.c_cflag = (newtio.c_cflag & ~CSIZE) | CS8;
-
- /* Set into raw, no echo mode */
-- #if defined(__FreeBSD__) || defined(__NetBSD__)
-+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL |
- IXANY | IXON | IXOFF | INPCK | ISTRIP);
- #else
diff --git a/graphics/gphoto/patches/patch-ab b/graphics/gphoto/patches/patch-ab
deleted file mode 100644
index 48838bbcceb..00000000000
--- a/graphics/gphoto/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/05/12 12:26:58 joerg Exp $
-
---- konica/setSpeed.c.orig 2006-05-06 12:23:27.000000000 +0000
-+++ konica/setSpeed.c
-@@ -17,14 +17,14 @@ void qm100_setSpeed(int serialdev, int s
-
- newt.c_cflag |= CS8;
- newt.c_iflag &= ~(IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|INLCR);
-- #if defined(__FreeBSD__) || defined(__NetBSD__) /* by fujisawa@konica.co.jp */
-+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) /* by fujisawa@konica.co.jp */
- newt.c_iflag &= ~(IGNCR|ICRNL|IXON|IXOFF| IXANY|IMAXBEL);
- #else
- newt.c_iflag &= ~(IGNCR|ICRNL|IXON|IXOFF|IUCLC|IXANY|IMAXBEL);
- #endif
- newt.c_oflag &= ~(OPOST);
- newt.c_lflag &= ~(ISIG|ICANON);
-- #if defined(__FreeBSD__) || defined(__NetBSD__)
-+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- /**/
- #else
- newt.c_cflag &= ~(XCASE);
diff --git a/graphics/gphoto/patches/patch-ac b/graphics/gphoto/patches/patch-ac
deleted file mode 100644
index ba16b9ff723..00000000000
--- a/graphics/gphoto/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/05/12 12:26:58 joerg Exp $
-
---- mustek/device.c.orig 2006-05-12 11:09:50.000000000 +0000
-+++ mustek/device.c
-@@ -59,7 +59,7 @@ int mdc800_device_setupDevice (fd, baud)
- newtio.c_cflag = (newtio.c_cflag & ~CSIZE) | CS8;
-
- // Set into raw, no echo mode
-- #if defined(__NetBSD__)
-+ #if defined(__NetBSD__) || defined(__DragonFly__)
- newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL |
- IXANY | IXON | IXOFF | INPCK | ISTRIP);
- #else
diff --git a/graphics/gphoto/patches/patch-ad b/graphics/gphoto/patches/patch-ad
deleted file mode 100644
index dc8a4ec8c28..00000000000
--- a/graphics/gphoto/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/05/12 12:26:59 joerg Exp $
-
---- sony/chotplay.c.orig 2006-05-12 11:27:38.000000000 +0000
-+++ sony/chotplay.c
-@@ -2,7 +2,6 @@
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
--extern int errno;
- #ifdef BINARYFILEMODE
- #include <fcntl.h> /* for setmode() */
- #endif
diff --git a/graphics/gphoto/patches/patch-ae b/graphics/gphoto/patches/patch-ae
deleted file mode 100644
index c567949d29a..00000000000
--- a/graphics/gphoto/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/01/19 15:52:40 cube Exp $
-
---- kodak/kodak_dc210.c.orig 2000-01-20 22:42:17.000000000 +0100
-+++ kodak/kodak_dc210.c
-@@ -789,11 +789,11 @@ char *kodak_dc210_summary()
- char *kodak_dc210_description()
- {
-
-- return("Enhanced Kodak DC210 support
--by TimeCop <timecop@japan.co.jp>
--http://www.ne.jp/asahi/linux/timecop
--based on original code
--by Brian Hirt <bhirt@mobygames.com>
-+ return("Enhanced Kodak DC210 support\n\
-+by TimeCop <timecop@japan.co.jp>\n\
-+http://www.ne.jp/asahi/linux/timecop\n\
-+based on original code\n\
-+by Brian Hirt <bhirt@mobygames.com> \n\
- http://www.mobygames.com");
-
- }
diff --git a/graphics/gphoto/patches/patch-af b/graphics/gphoto/patches/patch-af
deleted file mode 100644
index e133dca5459..00000000000
--- a/graphics/gphoto/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.4 2006/05/12 12:26:59 joerg Exp $
-
---- src/menu.c.orig 2006-05-12 11:37:58.000000000 +0000
-+++ src/menu.c
-@@ -17,6 +17,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <string.h>
- #include "main.h"
- #include "gphoto.h"
- #include "menu.h"
-@@ -177,6 +178,7 @@ void menu_select (gpointer data, guint a
- del_dialog(1);
- break;
- default:
-+ break;
- }
- }
-
diff --git a/graphics/gphoto/patches/patch-ai b/graphics/gphoto/patches/patch-ai
deleted file mode 100644
index 4933be65a27..00000000000
--- a/graphics/gphoto/patches/patch-ai
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2004/01/19 15:52:40 cube Exp $
-
---- kodak/kodak_dc2x.c.orig 1999-12-05 19:48:53.000000000 +0100
-+++ kodak/kodak_dc2x.c
-@@ -357,15 +357,15 @@ dc20_info->model, dc20_info->pic_taken,
- char *kodak_dc2x_description() {
-
- return(
--"Kodak DC25 and DC20 support
--by Del Simmons <del@freespeech.com>.
--This code is working on my DC25 but
--I know it will have some problems with
--the DC20. If you have a DC20, please
--give it a shot and let me know all
--the places it fails. If compiling for
--the DC20, please try removng the -DDC25
--flag from the Makefile in the kodak
-+"Kodak DC25 and DC20 support \n\
-+by Del Simmons <del@freespeech.com>. \n\
-+This code is working on my DC25 but \n\
-+I know it will have some problems with \n\
-+the DC20. If you have a DC20, please \n\
-+give it a shot and let me know all \n\
-+the places it fails. If compiling for\n\
-+the DC20, please try removng the -DDC25\n\
-+flag from the Makefile in the kodak \n\
- directory. Thanks!");
- }
-
diff --git a/graphics/gphoto/patches/patch-ao b/graphics/gphoto/patches/patch-ao
deleted file mode 100644
index 37cdb12a0f8..00000000000
--- a/graphics/gphoto/patches/patch-ao
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- directory/directory.c.orig 1999-07-02 01:11:05.000000000 +0200
-+++ directory/directory.c
-@@ -206,12 +206,12 @@ char *dir_summary() {
- static char *dir_description() {
-
- return(
--"Browse Directory\nScott Fritzinger <scottf@unr.edu>
--Allows the user to \"open\" a directory of
--images and all gPhoto functions will work
--on those images (HTML Gallery, etc...)\n
--This will not work in command-line mode,
--due to the high amount of input needed
-+"Browse Directory\nScott Fritzinger <scottf@unr.edu> \
-+Allows the user to \"open\" a directory of \
-+images and all gPhoto functions will work \
-+on those images (HTML Gallery, etc...)\n\
-+This will not work in command-line mode, \
-+due to the high amount of input needed \
- to set it up.");
-
- }
diff --git a/graphics/gphoto/patches/patch-ap b/graphics/gphoto/patches/patch-ap
deleted file mode 100644
index 3f6c687f09d..00000000000
--- a/graphics/gphoto/patches/patch-ap
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- fuji/fujilib.c.orig 2000-01-11 03:13:33.000000000 +0100
-+++ fuji/fujilib.c
-@@ -1157,13 +1157,13 @@ char *fuji_summary() {
-
- char *fuji_description() {
- return(
--"Generic Fuji
--Matthew G. Martin
--Based on fujiplay by
--Thierry Bousch<bousch@topo.math.u-psud.fr>
--
--Known to work with Fuji DS-7 and DX-5,7,10 and MX-500,600,700,2700
--, Apple QuickTake 200,Samsung Kenox SSC-350N cameras,
-+"Generic Fuji\n\
-+Matthew G. Martin\n\
-+Based on fujiplay by\n\
-+Thierry Bousch<bousch@topo.math.u-psud.fr>\n\
-+\n\
-+Known to work with Fuji DS-7 and DX-5,7,10 and MX-500,600,700,2700\n\
-+, Apple QuickTake 200,Samsung Kenox SSC-350N cameras, \n\
- but may support other Fuji cams as well.");
- }
-
diff --git a/graphics/gphoto/patches/patch-aq b/graphics/gphoto/patches/patch-aq
deleted file mode 100644
index d12dd371303..00000000000
--- a/graphics/gphoto/patches/patch-aq
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- kodak/dc21x/main.c.orig 2000-01-20 22:42:18.000000000 +0100
-+++ kodak/dc21x/main.c
-@@ -54,29 +54,29 @@ void print_info( int type )
-
- void usage(void)
- {
-- printf ("Kodak DC21x Digital Camera utility by timecop [timecop@japan.co.jp]
--
-- Usage:
-- -s n Use /dev/ttySn for camera port
-- -q Minimum messages to console [script use]
--
-- -i [n] Display Camera [ or picture n ] information
-- -n Display number of pictures in camera
-- -d n Delete image number n from camera
-- -D Delete all images from camera
-- -t [filename] Take a picture, save to filename
-- -r [n] [fname] Retrieve picture n, save as fname
-- -R Retrieve all pictures, save as imageNNN.jpg
--
-- -z 1|0 Set resolution to [1:High,0:Low]
-- -Q 1-3 Set JPEG quality. [1:Best,2:Better,3:Good]
-- -Z 0..4 | 5 Set zoom. [0:58mm,1:51mm,2:41mm,3:34mm,4:29mm,5:Macro]
-- -f 0-4 Flash setting. [0:Auto,1:Flash,2:NoFlash]
-- [3:RedEyeAuto,4:RedEyeFlash]
--
-- Some options can be combined, for example:
-- cam -s 2 -z 0 -q -f 1 -t webcam.jpg
--
-+ printf ("Kodak DC21x Digital Camera utility by timecop [timecop@japan.co.jp]\n\
-+\n\
-+ Usage:\n\
-+ -s n Use /dev/ttySn for camera port\n\
-+ -q Minimum messages to console [script use]\n\
-+ \n\
-+ -i [n] Display Camera [ or picture n ] information\n\
-+ -n Display number of pictures in camera\n\
-+ -d n Delete image number n from camera\n\
-+ -D Delete all images from camera\n\
-+ -t [filename] Take a picture, save to filename\n\
-+ -r [n] [fname] Retrieve picture n, save as fname\n\
-+ -R Retrieve all pictures, save as imageNNN.jpg\n\
-+\n\
-+ -z 1|0 Set resolution to [1:High,0:Low]\n\
-+ -Q 1-3 Set JPEG quality. [1:Best,2:Better,3:Good]\n\
-+ -Z 0..4 | 5 Set zoom. [0:58mm,1:51mm,2:41mm,3:34mm,4:29mm,5:Macro]\n\
-+ -f 0-4 Flash setting. [0:Auto,1:Flash,2:NoFlash]\n\
-+ [3:RedEyeAuto,4:RedEyeFlash]\n\
-+ \n\
-+ Some options can be combined, for example:\n\
-+ cam -s 2 -z 0 -q -f 1 -t webcam.jpg\n\
-+\n\
- ");
- }
-
diff --git a/graphics/gphoto/patches/patch-ar b/graphics/gphoto/patches/patch-ar
deleted file mode 100644
index d5d8975c0ab..00000000000
--- a/graphics/gphoto/patches/patch-ar
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- philips/philips.h.orig 1999-11-20 17:28:41.000000000 +0100
-+++ philips/philips.h
-@@ -86,38 +86,38 @@ typedef struct PHILIPS_CFG {
-
-
- static char *philips_description_string =
--"Philips/Ricoh gPhoto Library
--Bob Paauwe <bpaauwe@bobsplace.com>
--http://www.bobsplace.com/philips/
--
--The following cameras are known to work:
--Philips ESP60
--Philips ESP80
--Ricoh RDC-300
--Ricoh RDC-300Z
--Ricoh RDC-4200
--Ricoh RDC-4300
--Ricoh RDC-5000
--
--Should work with other Ricoh and Philips
--models but I need the identifier number for
--them. If you have a:
--
-- RDC-1, RDC-2, RDC-2E, RDC-100G, ESP50,
-- ESP60, or ESP2
--
--please bring up the configuration dialog
--box and send me the number that appears in
--the status bar as Unkown model nnnn.
--
--Known Issues as of 8/25/1999:
-- 1) Thumbnails are only displayed
-- in black & white. (except RDC-5000)
-- 2) philips_get_preview function only
-- works for Philips ESP80/Ricoh 4x00
-- cameras.
-- 3) Every other thumbnail times out
-- with RDC-5000.
-+"Philips/Ricoh gPhoto Library\n\
-+Bob Paauwe <bpaauwe@bobsplace.com>\n\
-+http://www.bobsplace.com/philips/\n\
-+\n\
-+The following cameras are known to work:\n\
-+Philips ESP60\n\
-+Philips ESP80\n\
-+Ricoh RDC-300\n\
-+Ricoh RDC-300Z\n\
-+Ricoh RDC-4200\n\
-+Ricoh RDC-4300\n\
-+Ricoh RDC-5000\n\
-+\n\
-+Should work with other Ricoh and Philips\n\
-+models but I need the identifier number for\n\
-+them. If you have a:\n\
-+\n\
-+ RDC-1, RDC-2, RDC-2E, RDC-100G, ESP50, \n\
-+ ESP60, or ESP2 \n\
-+\n\
-+please bring up the configuration dialog\n\
-+box and send me the number that appears in\n\
-+the status bar as Unkown model nnnn.\n\
-+\n\
-+Known Issues as of 8/25/1999:\n\
-+ 1) Thumbnails are only displayed\n\
-+ in black & white. (except RDC-5000)\n\
-+ 2) philips_get_preview function only\n\
-+ works for Philips ESP80/Ricoh 4x00\n\
-+ cameras.\n\
-+ 3) Every other thumbnail times out \n\
-+ with RDC-5000.\n\
- ";
-
-
diff --git a/graphics/gphoto/patches/patch-as b/graphics/gphoto/patches/patch-as
deleted file mode 100644
index b4132a21bed..00000000000
--- a/graphics/gphoto/patches/patch-as
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-as,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- photopc/olympus.c.orig 1999-06-25 02:25:46.000000000 +0200
-+++ photopc/olympus.c
-@@ -594,10 +594,10 @@ char *oly_summary() {
- char *oly_description() {
-
- return(
--"Olympus/PhotoPC Digital Camera Support
--Scott Fritzinger <scottf@unr.edu>
--using the photoPC library by
--Eugene Crosser <crosser@average.org>
-+"Olympus/PhotoPC Digital Camera Support\n\
-+Scott Fritzinger <scottf@unr.edu>\n\
-+using the photoPC library by\n\
-+Eugene Crosser <crosser@average.org>\n\
- http://www.average.org/digicam");
- }
-
diff --git a/graphics/gphoto/patches/patch-at b/graphics/gphoto/patches/patch-at
deleted file mode 100644
index decf9b55a70..00000000000
--- a/graphics/gphoto/patches/patch-at
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- ricoh/ricoh_300z.c.orig 1999-10-03 01:41:37.000000000 +0200
-+++ ricoh/ricoh_300z.c
-@@ -914,12 +914,12 @@ char *ricoh_300z_summary() {
- char *ricoh_300z_description() {
-
- return(
--"Ricoh 300Z
--Clifford Wright <cliff@snipe444.org>
--
--*The Ricoh 300Z does not support thumbnail
--previewing, so the thumbnails that appear
--are place holders until the actual images
-+"Ricoh 300Z\n\
-+Clifford Wright <cliff@snipe444.org>\n\
-+\n\
-+*The Ricoh 300Z does not support thumbnail\n\
-+previewing, so the thumbnails that appear\n\
-+are place holders until the actual images\n\
- are downloaded.");
- }
-
diff --git a/graphics/gphoto/patches/patch-au b/graphics/gphoto/patches/patch-au
deleted file mode 100644
index 4b4107825b5..00000000000
--- a/graphics/gphoto/patches/patch-au
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-au,v 1.2 2005/11/05 18:58:04 kristerw Exp $
-
---- sony/command.c.orig 1999-05-27 20:32:06.000000000 +0200
-+++ sony/command.c
-@@ -288,11 +288,11 @@ char* return_buf;
- break;
- }
- sprintf(tmp_buf, "Total Pictures: %02d\n", pic_num);
-- strcat(status_buf, tmp_buf, sizeof(tmp_buf));
-+ strlcat(status_buf, tmp_buf, sizeof(tmp_buf));
- sprintf(tmp_buf, "Date: %02d/%02d/%02d\n", month, date, year);
-- strcat(status_buf, tmp_buf, sizeof(tmp_buf));
-+ strlcat(status_buf, tmp_buf, sizeof(tmp_buf));
- sprintf(tmp_buf, "Time: %02d:%02d\n",hour, minutes);
-- strcat(status_buf, tmp_buf, sizeof(tmp_buf));
-+ strlcat(status_buf, tmp_buf, sizeof(tmp_buf));
- }
- /* return (buf[2]); ok*/
- strcpy(return_buf, status_buf);
diff --git a/graphics/gphoto/patches/patch-av b/graphics/gphoto/patches/patch-av
deleted file mode 100644
index 312f32b2df9..00000000000
--- a/graphics/gphoto/patches/patch-av
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- sony/dsc_f1.c.orig 1999-05-27 20:32:06.000000000 +0200
-+++ sony/dsc_f1.c
-@@ -166,10 +166,10 @@ int dsc_f1_delete_image (int picNum) {
-
- char *dsc_f1_description () {
- return(
-- "Sony DSC-F1 Digital Camera Support\n
-- M. Adam Kendall <joker@penguinpub.com>\n\n
-- Based on the chotplay CLI interface from\n
-- Ken-ichi Hayashi\n\n
-+ "Sony DSC-F1 Digital Camera Support\n\
-+ M. Adam Kendall <joker@penguinpub.com>\n\n\
-+ Based on the chotplay CLI interface from\n\
-+ Ken-ichi Hayashi\n\n\
- This lib may not work. YMMV\n");
- }
-
diff --git a/graphics/gphoto/patches/patch-aw b/graphics/gphoto/patches/patch-aw
deleted file mode 100644
index 5a16df0d56d..00000000000
--- a/graphics/gphoto/patches/patch-aw
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- sony/dscf55/rsony.c.orig 2000-01-26 15:36:22.000000000 +0100
-+++ sony/dscf55/rsony.c
-@@ -378,26 +378,26 @@ char *sony_dscf55_summary()
- */
- char *sony_dscf55_description()
- {
-- return "Sony DSC F55/505 gPhoto Library
--Mark Davies <mdavies@dial.pipex.com>
--Sony DSC F55 and DSC F505 cameras.
--Still image support.
--* Mpegs are downloadable in standalone
-- version only.
-+ return "Sony DSC F55/505 gPhoto Library\n\
-+Mark Davies <mdavies@dial.pipex.com>\n\
-+Sony DSC F55 and DSC F505 cameras.\n\
-+Still image support.\n\
-+* Mpegs are downloadable in standalone\n\
-+ version only.\n\
- ";
- }
-
-
- char *sony_msac_sr1_description()
- {
-- return "Sony DSC F55/505 gPhoto Library
--Mark Davies <mdavies@dial.pipex.com>
--Sony MSAC-SR1 and Memory Stick used
--by DCR-PC100.
--Still image support. Patches by
--Bernd Seemann <bernd@seebaer.ruhr.de>
--* Mpegs are downloadable in
--standalone version only.
-+ return "Sony DSC F55/505 gPhoto Library\n\
-+Mark Davies <mdavies@dial.pipex.com>\n\
-+Sony MSAC-SR1 and Memory Stick used\n\
-+by DCR-PC100.\n\
-+Still image support. Patches by\n\
-+Bernd Seemann <bernd@seebaer.ruhr.de>\n\
-+* Mpegs are downloadable in\n\
-+standalone version only.\n\
- ";
- }
-
diff --git a/graphics/gphoto/patches/patch-ax b/graphics/gphoto/patches/patch-ax
deleted file mode 100644
index 06eebdb796b..00000000000
--- a/graphics/gphoto/patches/patch-ax
+++ /dev/null
@@ -1,133 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- src/callbacks.c.orig 2000-03-06 22:23:06.000000000 +0100
-+++ src/callbacks.c
-@@ -790,18 +790,18 @@ void save_config() {
- void version_dialog() {
- char msg[1024];
-
-- sprintf(msg, "
--Version Information
---------------------
--
--Current Version: %s
--
--New features all over the place. Please see
--the ChangeLog for more information.
--
--As always, report bugs gphoto-devel@gphoto.org
--
--Thanx much.
-+ sprintf(msg, "\n\
-+Version Information\n\
-+-------------------\n\
-+\n\
-+Current Version: %s\n\
-+\n\
-+New features all over the place. Please see\n\
-+the ChangeLog for more information.\n\
-+\n\
-+As always, report bugs gphoto-devel@gphoto.org\n\
-+\n\
-+Thanx much.\n\
- ", VERSION);
-
- error_dialog(msg);
-@@ -865,27 +865,27 @@ void usersmanual_dialog() {
-
- void faq_dialog() {
- error_dialog(
--"Please visit http://www.gphoto.org/help.php3
-+"Please visit http://www.gphoto.org/help.php3 \n\
- for the current FAQ list.");
- }
-
- void show_license() {
-
-- error_dialog("
--This program is free software; you can redistribute it and/or modify
--it under the terms of the GNU General Public License as published by
--the Free Software Foundation; either version 2 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--GNU General Public License for more details.
--
--You should have received a copy of the GNU General Public License
--along with this program; if not, write to the Free Software
--Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
-+ error_dialog("\n\
-+This program is free software; you can redistribute it and/or modify\n\
-+it under the terms of the GNU General Public License as published by\n\
-+the Free Software Foundation; either version 2 of the License, or\n\
-+(at your option) any later version.\n\
-+\n\
-+This program is distributed in the hope that it will be useful,\n\
-+but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
-+GNU General Public License for more details.\n\
-+\n\
-+You should have received a copy of the GNU General Public License\n\
-+along with this program; if not, write to the Free Software\n\
-+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\
-+\n\
- See http://www.gnu.org for more details on the GNU project.");
- }
-
-@@ -1238,9 +1238,9 @@ void save_opened_image (int i, char *fil
-
- if (gdk_imlib_save_image(node->imlibimage,filename, NULL) == 0) {
- error_dialog(
-- "Could not save image. Please make
-- sure that you typed the image
-- extension and that permissions for
-+ "Could not save image. Please make\n\
-+ sure that you typed the image\n\
-+ extension and that permissions for\n\
- the directory are correct.");
- return;
- }
-@@ -1370,11 +1370,11 @@ void print_pic () {
- gtk_box_pack_end_defaults(GTK_BOX(hbox),entry);
-
- label = gtk_label_new(
--"* The filename is appended to the end
-- of the command.
--* The \"-r\" flag is needed to delete
-- the temporary file. If not used, a
-- temporary file will be in your $HOME/.gphoto
-+"* The filename is appended to the end\n\
-+ of the command.\n\
-+* The \"-r\" flag is needed to delete \n\
-+ the temporary file. If not used, a \n\
-+ temporary file will be in your $HOME/.gphoto\n\
- directory.");
- gtk_widget_show(label);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-@@ -1814,9 +1814,9 @@ void post_process_change (GtkWidget *wid
- FALSE, FALSE, 0);
-
- label = gtk_label_new(
--"
--Note: gPhoto will replace \"%s\" in the script command-line
--with the full path to the selected image. See the User's Manual
-+"\n\
-+Note: gPhoto will replace \"%s\" in the script command-line\n\
-+with the full path to the selected image. See the User's Manual\n\
- in the Help menu for more information. ");
- gtk_widget_show(label);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-@@ -1832,8 +1832,8 @@ in the Help menu for more information. "
- if ((strstr(gtk_entry_get_text(GTK_ENTRY(script)), "%s") == NULL)
- && GTK_TOGGLE_BUTTON(pp)->active) {
- error_dialog(
--"Missing \"%s\" in the post-processing entry.
--This is required so the post-processing program
-+"Missing \"%s\" in the post-processing entry.\n\
-+This is required so the post-processing program\n\
- knows where the image is located.");
- return;
- }
diff --git a/graphics/gphoto/patches/patch-ay b/graphics/gphoto/patches/patch-ay
deleted file mode 100644
index 3bc5e8afb96..00000000000
--- a/graphics/gphoto/patches/patch-ay
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- src/gallery.c.orig 2000-03-06 22:23:06.000000000 +0100
-+++ src/gallery.c
-@@ -271,9 +271,9 @@ void gallery_main() {
-
- if (Thumbnails.next == NULL) {
- error_dialog(
--"Please retrieve the index first,
--and select the images to include
--in the gallery by clicking on them.
-+"Please retrieve the index first,\n\
-+and select the images to include\n\
-+in the gallery by clicking on them.\n\
- Then, re-run the HTML Gallery.");
- return;
- }
diff --git a/graphics/gphoto/patches/patch-az b/graphics/gphoto/patches/patch-az
deleted file mode 100644
index cecb653a9b2..00000000000
--- a/graphics/gphoto/patches/patch-az
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-az,v 1.1 2004/01/19 15:52:40 cube Exp $
-
---- src/main.c.orig 2000-03-06 22:23:06.000000000 +0100
-+++ src/main.c
-@@ -277,10 +277,10 @@ int main (int argc, char *argv[]) {
- /* put anything here to do on the first run */
- developer_dialog_create();
- error_dialog(
--"Could not load config file.
--Resetting to defaults.
--Click on \"Select Port-Camera Model\"
--in the Configure menu to set your
-+"Could not load config file.\n\
-+Resetting to defaults.\n\
-+Click on \"Select Port-Camera Model\"\n\
-+in the Configure menu to set your\n\
- camera model and serial port");
- }
- gtk_main();
diff --git a/graphics/gphoto/patches/patch-ba b/graphics/gphoto/patches/patch-ba
deleted file mode 100644
index c0e4ab2f643..00000000000
--- a/graphics/gphoto/patches/patch-ba
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2006/05/12 12:26:59 joerg Exp $
-
---- src/util.c.orig 2000-03-06 21:23:06.000000000 +0000
-+++ src/util.c
-@@ -11,8 +11,7 @@
- #include <errno.h>
- #include <sys/dir.h>
- #include <dirent.h>
--#ifdef __FreeBSD__
--#else
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- #include <sys/resource.h>
- #endif
- #ifdef linux
-@@ -257,7 +256,7 @@ void save_image (char *filename, struct
- else
- {
- snprintf(errormsg,1024,
--"The image couldn't be saved to %s because of the following error:
-+"The image couldn't be saved to %s because of the following error: \n\
- %s",filename,sys_errlist[errno]);
- error_dialog(errormsg);
- }
diff --git a/graphics/gphoto/patches/patch-bb b/graphics/gphoto/patches/patch-bb
deleted file mode 100644
index 9ff4d629bf1..00000000000
--- a/graphics/gphoto/patches/patch-bb
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2007/08/08 19:41:30 joerg Exp $
-
---- philips/philips_io.c.orig 2007-08-08 19:18:51.000000000 +0000
-+++ philips/philips_io.c
-@@ -55,7 +55,6 @@ void update_status (char *message);
- #include <errno.h>
- #include <signal.h>
- #include <time.h>
--#include <malloc.h>
- #include <unistd.h>
- #include <string.h>
- #include <sys/time.h>
diff --git a/graphics/ov519view/DESCR b/graphics/ov519view/DESCR
deleted file mode 100644
index c7f171409ef..00000000000
--- a/graphics/ov519view/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-USB cameras based OV519 Utility Programs
-
-ov519shot ... simple image capture program ( output stdout JPEG file )
-ov519view ... sequential image viewer program
diff --git a/graphics/ov519view/MESSAGE b/graphics/ov519view/MESSAGE
deleted file mode 100644
index 2543d9a285e..00000000000
--- a/graphics/ov519view/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2006/03/14 17:16:46 hamajima Exp $
-
-If you are not able to probe a camera, you should apply following kernel patch.
-
- http://www.medias.ne.jp/~takam/bsd/ov51xview-netbsd-sys-2-0.diff
-
-===========================================================================
diff --git a/graphics/ov519view/Makefile b/graphics/ov519view/Makefile
deleted file mode 100644
index 786c09e1676..00000000000
--- a/graphics/ov519view/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2011/02/19 09:02:07 markd Exp $
-#
-
-DISTNAME= ov51x-1.65-1.11-mark
-PKGNAME= ov519view-0.00
-PKGREVISION= 9
-CATEGORIES= graphics x11
-MASTER_SITES= http://alpha.dyndns.org/ov511/download/ov51x/
-EXTRACT_SUFX= .tar.bz2
-
-PATCH_SITES= http://home.384.jp/takam/bsd/
-PATCHFILES= ov51x-1.65-1.11-mark-bsd-0.00.patch.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= hamajima@NetBSD.org
-HOMEPAGE= http://home.384.jp/takam/bsd/NetBSD.html#ov519
-COMMENT= USB cameras based OV519 Utility Programs
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
-
-MAKE_ENV+= ${BSD_MAKE_ENV}
-
-do-build:
- for f in ov519shot ov519view ; do \
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- NOGCCERROR= \
- ${MAKE_PROGRAM} -f ${MAKE_FILE}.$$f ; \
- done
-
-do-install:
- for f in ov519shot ov519view ; do \
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} -f ${MAKE_FILE}.$$f install ${INSTALL_MAKE_FLAGS}; \
- done
-
-.include "../../graphics/imlib-gtk/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ov519view/PLIST b/graphics/ov519view/PLIST
deleted file mode 100644
index 0d7842332c0..00000000000
--- a/graphics/ov519view/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/10/08 06:33:04 hamajima Exp $
-bin/ov519shot
-bin/ov519view
-man/cat1/ov519shot.0
-man/cat1/ov519view.0
-man/man1/ov519shot.1
-man/man1/ov519view.1
diff --git a/graphics/ov519view/distinfo b/graphics/ov519view/distinfo
deleted file mode 100644
index d063c3e9a2a..00000000000
--- a/graphics/ov519view/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/04/22 18:06:30 joerg Exp $
-
-SHA1 (ov51x-1.65-1.11-mark.tar.bz2) = 137354923edac4409358ddee3317576081b3b3da
-RMD160 (ov51x-1.65-1.11-mark.tar.bz2) = b554436a24d887cd39daea88946ad49d29ca8afe
-Size (ov51x-1.65-1.11-mark.tar.bz2) = 108501 bytes
-SHA1 (ov51x-1.65-1.11-mark-bsd-0.00.patch.gz) = f07161fb5d8dbd82235b42e76bcbb6d1f3ccf20f
-RMD160 (ov51x-1.65-1.11-mark-bsd-0.00.patch.gz) = dc78609d86a32a040804af9c4d2162ff34ff2d4b
-Size (ov51x-1.65-1.11-mark-bsd-0.00.patch.gz) = 18664 bytes
-SHA1 (patch-aa) = 9aaf3096fa9fdd4530004a41daa7a21a4f858ba7
-SHA1 (patch-ab) = 8c83bfbe51cd01e80909c57974e13cc0b2ea4c45
-SHA1 (patch-ac) = c5c5aac3bc655f6c0c7ae0fa320a7f658374a841
-SHA1 (patch-ad) = 7c5031292c267209415c8cae296a05d56ed553eb
-SHA1 (patch-ae) = 1c3ab9021e9491ecf8a81f1d8007a99d20ed4268
diff --git a/graphics/ov519view/patches/patch-aa b/graphics/ov519view/patches/patch-aa
deleted file mode 100644
index e4bcba0abd1..00000000000
--- a/graphics/ov519view/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/02/01 13:03:31 hamajima Exp $
-
---- ov51x.h.orig Tue Feb 1 21:45:32 2005
-+++ ov51x.h Tue Feb 1 21:44:56 2005
-@@ -27,6 +27,10 @@
- #include <stdio.h>
- #include "linux_usbif.h"
-
-+#ifndef ENOSR /* before NetBSD 2.0 */
-+#define ENOSR 90 /* No STREAM resource */
-+#endif
-+
- #define OV511_DEBUG /* Turn on debug messages */
-
- #ifdef OV511_DEBUG
diff --git a/graphics/ov519view/patches/patch-ab b/graphics/ov519view/patches/patch-ab
deleted file mode 100644
index 8b1ef42c0c0..00000000000
--- a/graphics/ov519view/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/04/22 18:06:30 joerg Exp $
-
---- linux_usbif.c.orig 2006-04-22 17:50:45.000000000 +0000
-+++ linux_usbif.c
-@@ -29,7 +29,11 @@
-
- #include <ctype.h>
- #include <sys/ioctl.h>
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include "linux_usbif.h"
-
diff --git a/graphics/ov519view/patches/patch-ac b/graphics/ov519view/patches/patch-ac
deleted file mode 100644
index c9c9b28767d..00000000000
--- a/graphics/ov519view/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/22 18:06:30 joerg Exp $
-
---- linux_usbif.h.orig 2006-04-22 17:50:37.000000000 +0000
-+++ linux_usbif.h
-@@ -19,7 +19,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #define USB_ENDPOINT_DIR_MASK 0x80
- #define USB_DIR_OUT UT_WRITE
diff --git a/graphics/ov519view/patches/patch-ad b/graphics/ov519view/patches/patch-ad
deleted file mode 100644
index e981d88fd91..00000000000
--- a/graphics/ov519view/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/04/22 18:06:30 joerg Exp $
-
---- ov519shot.c.orig 2006-04-22 17:56:45.000000000 +0000
-+++ ov519shot.c
-@@ -37,7 +37,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include "linux_usbif.h"
- #include "ov51x.h"
diff --git a/graphics/ov519view/patches/patch-ae b/graphics/ov519view/patches/patch-ae
deleted file mode 100644
index b73bfbcb33e..00000000000
--- a/graphics/ov519view/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/04/22 18:06:30 joerg Exp $
-
---- ov519view.c.orig 2006-04-22 17:50:21.000000000 +0000
-+++ ov519view.c
-@@ -41,7 +41,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include <gtk/gtk.h>
- #include <gdk_imlib.h>
diff --git a/graphics/phpsview/DESCR b/graphics/phpsview/DESCR
deleted file mode 100644
index 62d9f2307e3..00000000000
--- a/graphics/phpsview/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Philips USB Cameras Utilities for NetBSD
-
-phpsshot ... simple image capture program ( output stdout PPM file )
-phpsview ... sequential image viewer program ( about 3fps )
-
-Note this program has been discontinued by the author.
diff --git a/graphics/phpsview/Makefile b/graphics/phpsview/Makefile
deleted file mode 100644
index 0bf048eb5f8..00000000000
--- a/graphics/phpsview/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2011/02/19 09:02:07 markd Exp $
-#
-
-DISTNAME= pwc-9.0.2
-PKGNAME= phpsview-${DISTNAME:C/.*-//}
-PKGREVISION= 7
-CATEGORIES= graphics x11
-MASTER_SITES= http://www.smcc.demon.nl/webcam/
-
-PATCH_SITES= http://www.medias.ne.jp/~takam/bsd/
-PATCHFILES= pwc-9.0.2-bsd-0.03.patch.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= hamajima@NetBSD.org
-HOMEPAGE= http://www.medias.ne.jp/~takam/bsd/NetBSD.html#qcamPro
-COMMENT= Philips USB Cameras Utilities
-
-PKG_DESTDIR_SUPPORT= user-destdir
-INSTALLATION_DIRS= bin
-
-do-build:
- for f in phpsshot phpsview ; do \
- cd ${WRKSRC}/2.4 && ${SETENV} ${MAKE_ENV} \
- NOGCCERROR= \
- ${MAKE_PROGRAM} -f ${MAKE_FILE}.$$f ; \
- done
-
-do-install:
- for f in phpsshot phpsview ; do \
- cd ${WRKSRC}/2.4 && \
- ${INSTALL_PROGRAM} $$f ${DESTDIR}${PREFIX}/bin; \
- done
-
-.include "../../graphics/imlib-gtk/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/phpsview/PLIST b/graphics/phpsview/PLIST
deleted file mode 100644
index 9af3aa08936..00000000000
--- a/graphics/phpsview/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/11 14:01:53 hamajima Exp $
-bin/phpsshot
-bin/phpsview
diff --git a/graphics/phpsview/distinfo b/graphics/phpsview/distinfo
deleted file mode 100644
index 47fe9b78b05..00000000000
--- a/graphics/phpsview/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/04/22 18:18:38 joerg Exp $
-
-SHA1 (pwc-9.0.2.tar.gz) = 6d5b3e66bdc70c3e22b318da7c69242af5b9605b
-RMD160 (pwc-9.0.2.tar.gz) = 359b6d117e0eb3dd2582f1d399325cc65a2f7a8e
-Size (pwc-9.0.2.tar.gz) = 230499 bytes
-SHA1 (pwc-9.0.2-bsd-0.03.patch.gz) = 83b22d2794d9244eccec92a553077d07057af979
-RMD160 (pwc-9.0.2-bsd-0.03.patch.gz) = 188a5b03626fcd348b768ec3ec3063bb912fd66b
-Size (pwc-9.0.2-bsd-0.03.patch.gz) = 19679 bytes
-SHA1 (patch-aa) = 58a41ec62139e11d96af8602a7b0699a3fb57163
-SHA1 (patch-ab) = c10923feff357485dda1c112a6403d5edd3deccb
-SHA1 (patch-ac) = 56ef232c406aabdc3fc34e81925e2370410a94ad
-SHA1 (patch-ad) = 3683b01e56340ab2d0f79505171235a90434a15b
-SHA1 (patch-ae) = c68639358801340fcceaaf2b5d2167913c30993b
diff --git a/graphics/phpsview/patches/patch-aa b/graphics/phpsview/patches/patch-aa
deleted file mode 100644
index 4847e2420ec..00000000000
--- a/graphics/phpsview/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/22 18:18:38 joerg Exp $
-
---- 2.4/linux_usbif.c.orig 2006-04-22 18:10:49.000000000 +0000
-+++ 2.4/linux_usbif.c
-@@ -27,7 +27,11 @@
-
- #include <ctype.h>
- #include <sys/ioctl.h>
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include "linux_usbif.h"
-
diff --git a/graphics/phpsview/patches/patch-ab b/graphics/phpsview/patches/patch-ab
deleted file mode 100644
index d0726dd11ed..00000000000
--- a/graphics/phpsview/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/04/22 18:18:38 joerg Exp $
-
---- 2.4/linux_usbif.h.orig 2006-04-22 18:11:24.000000000 +0000
-+++ 2.4/linux_usbif.h
-@@ -11,7 +11,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #define USB_DIR_OUT UT_WRITE
- #define USB_DIR_IN UT_READ
diff --git a/graphics/phpsview/patches/patch-ac b/graphics/phpsview/patches/patch-ac
deleted file mode 100644
index c0df4733d71..00000000000
--- a/graphics/phpsview/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/22 18:18:38 joerg Exp $
-
---- 2.4/phpsshot.c.orig 2006-04-22 18:11:36.000000000 +0000
-+++ 2.4/phpsshot.c
-@@ -32,7 +32,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include "linux_usbif.h"
- #include "pwc.h"
diff --git a/graphics/phpsview/patches/patch-ad b/graphics/phpsview/patches/patch-ad
deleted file mode 100644
index a31f2db7230..00000000000
--- a/graphics/phpsview/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/04/22 18:18:38 joerg Exp $
-
---- 2.4/phpsview.c.orig 2006-04-22 18:11:58.000000000 +0000
-+++ 2.4/phpsview.c
-@@ -37,7 +37,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include <gtk/gtk.h>
- #include <gdk_imlib.h>
diff --git a/graphics/phpsview/patches/patch-ae b/graphics/phpsview/patches/patch-ae
deleted file mode 100644
index 0d33a5a02fa..00000000000
--- a/graphics/phpsview/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/04/22 18:18:38 joerg Exp $
-
---- 2.4/pwc-if.c.orig 2006-04-22 18:12:11.000000000 +0000
-+++ 2.4/pwc-if.c
-@@ -56,7 +56,11 @@
- #include <ctype.h>
- #include <sys/ioctl.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
- #include "linux_usbif.h"
-
- #include "pwc.h"
diff --git a/graphics/pixieplus/DESCR b/graphics/pixieplus/DESCR
deleted file mode 100644
index dd3cba4ed9c..00000000000
--- a/graphics/pixieplus/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-PixiePlus is a free, fast, and feature packed image browser, viewer, and
-image/photo editor for Unix/X11 systems that run KDE.
-
-Features:
-- Fast, flexible thumbnail preview generation
-- Embedded JPEG and TIFF thumbnail support
-- Lossless JPEG transformations
-- Supports many image formats
-- Highly configurable HTML export
-- Batch conversion and effects
-- Animated slideshows
-- Similiar image finding
-- File management optimized for images
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
deleted file mode 100644
index 9e1a9216bfc..00000000000
--- a/graphics/pixieplus/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.44 2011/01/13 13:38:14 wiz Exp $
-#
-
-DISTNAME= pixieplus-0.5.4
-PKGREVISION= 28
-CATEGORIES= graphics
-MASTER_SITES= http://people.fruitsalad.org/avleeuwen/distfiles/pixieplus/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.mosfet.org/pixie/
-COMMENT= Free, fast, and feature packed image browser for KDE
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-
-.include "../../mk/bsd.prefs.mk"
-
-CPPFLAGS+= -I${BUILDLINK_PREFIX.ImageMagick}/include/ImageMagick
-
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/kdegraphics3/buildlink3.mk"
-.include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pixieplus/PLIST b/graphics/pixieplus/PLIST
deleted file mode 100644
index 4fa91943f88..00000000000
--- a/graphics/pixieplus/PLIST
+++ /dev/null
@@ -1,235 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:59:24 joerg Exp $
-bin/pixie
-lib/libpixie_misc.la
-lib/pixie.la
-share/icons/hicolor/16x16/actions/backimage.png
-share/icons/hicolor/16x16/actions/brightness.png
-share/icons/hicolor/16x16/actions/catagory.png
-share/icons/hicolor/16x16/actions/contrast+.png
-share/icons/hicolor/16x16/actions/contrast-.png
-share/icons/hicolor/16x16/actions/dim.png
-share/icons/hicolor/16x16/actions/forwardimage.png
-share/icons/hicolor/16x16/actions/hotlistadd.png
-share/icons/hicolor/16x16/actions/hotlistdel.png
-share/icons/hicolor/16x16/actions/nextfilelist.png
-share/icons/hicolor/16x16/actions/prevfilelist.png
-share/icons/hicolor/16x16/actions/thumb.png
-share/icons/hicolor/16x16/apps/pixie.png
-share/icons/hicolor/22x22/actions/catagory.png
-share/icons/hicolor/22x22/actions/thumb.png
-share/icons/hicolor/32x32/actions/catagory.png
-share/icons/hicolor/32x32/actions/thumb.png
-share/icons/hicolor/32x32/actions/window_new.png
-share/icons/hicolor/32x32/apps/pixie.png
-share/icons/hicolor/48x48/apps/pixie.png
-share/icons/locolor/16x16/actions/hotlistadd.png
-share/icons/locolor/16x16/actions/hotlistdel.png
-share/icons/locolor/16x16/actions/thumb.png
-share/icons/locolor/16x16/apps/ray.png
-share/icons/locolor/16x16/apps/run.png
-share/icons/locolor/22x22/actions/thumb.png
-share/icons/locolor/32x32/actions/thumb.png
-share/kde/applnk/Graphics/pixie-mini.desktop
-share/kde/applnk/Graphics/pixie.desktop
-share/kde/apps/konqueror/servicemenus/konqPixie.desktop
-share/kde/apps/pixie/doc/en/addtext.jpg
-share/kde/apps/pixie/doc/en/back.png
-share/kde/apps/pixie/doc/en/basic/basic.html
-share/kde/apps/pixie/doc/en/basic/thb_addtext.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_back.png
-share/kde/apps/pixie/doc/en/basic/thb_borders.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_browser.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_catagoryadd.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_catagoryselect.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_comparison.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_embedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_filelist.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_format.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_forward.png
-share/kde/apps/pixie/doc/en/basic/thb_fullscreentb.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_gohome.png
-share/kde/apps/pixie/doc/en/basic/thb_grayscalepreview.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_hi16-action-catagory.png
-share/kde/apps/pixie/doc/en/basic/thb_hotlist.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_htmllogo.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_layout2.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_lowquality.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_noembedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_nothumb.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_pixielogo.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_scale.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_screenshot.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_similarprogress.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_slideshow.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_stop.png
-share/kde/apps/pixie/doc/en/basic/thb_thumb.png
-share/kde/apps/pixie/doc/en/basic/thb_thumbnailed.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_tooltip.jpg.png
-share/kde/apps/pixie/doc/en/basic/thb_up.png
-share/kde/apps/pixie/doc/en/batch.html
-share/kde/apps/pixie/doc/en/borders.jpg
-share/kde/apps/pixie/doc/en/browser.jpg
-share/kde/apps/pixie/doc/en/catagoryadd.jpg
-share/kde/apps/pixie/doc/en/catagoryselect.jpg
-share/kde/apps/pixie/doc/en/categories.html
-share/kde/apps/pixie/doc/en/comparison.html
-share/kde/apps/pixie/doc/en/comparison.jpg
-share/kde/apps/pixie/doc/en/contents.html
-share/kde/apps/pixie/doc/en/convert.html
-share/kde/apps/pixie/doc/en/embedthumbnail.jpg
-share/kde/apps/pixie/doc/en/filelist.html
-share/kde/apps/pixie/doc/en/filelist.jpg
-share/kde/apps/pixie/doc/en/format.jpg
-share/kde/apps/pixie/doc/en/forward.png
-share/kde/apps/pixie/doc/en/framed/framed.html
-share/kde/apps/pixie/doc/en/framed/framed2.html
-share/kde/apps/pixie/doc/en/framed/framed3.html
-share/kde/apps/pixie/doc/en/framed/framed4.html
-share/kde/apps/pixie/doc/en/framed/framed5.html
-share/kde/apps/pixie/doc/en/framed/framed6.html
-share/kde/apps/pixie/doc/en/framed/thb_addtext.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_back.png
-share/kde/apps/pixie/doc/en/framed/thb_borders.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_browser.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_catagoryadd.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_catagoryselect.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_comparison.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_embedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_filelist.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_format.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_forward.png
-share/kde/apps/pixie/doc/en/framed/thb_fullscreentb.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_gohome.png
-share/kde/apps/pixie/doc/en/framed/thb_grayscalepreview.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_hi16-action-catagory.png
-share/kde/apps/pixie/doc/en/framed/thb_hotlist.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_htmllogo.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_layout2.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_lowquality.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_noembedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_nothumb.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_pixielogo.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_scale.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_screenshot.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_similarprogress.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_slideshow.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_stop.png
-share/kde/apps/pixie/doc/en/framed/thb_thumb.png
-share/kde/apps/pixie/doc/en/framed/thb_thumbnailed.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_tooltip.jpg.png
-share/kde/apps/pixie/doc/en/framed/thb_up.png
-share/kde/apps/pixie/doc/en/fullscreentb.jpg
-share/kde/apps/pixie/doc/en/galleryexample.html
-share/kde/apps/pixie/doc/en/gohome.png
-share/kde/apps/pixie/doc/en/grayscalepreview.jpg
-share/kde/apps/pixie/doc/en/hi16-action-catagory.png
-share/kde/apps/pixie/doc/en/hotlist.html
-share/kde/apps/pixie/doc/en/hotlist.jpg
-share/kde/apps/pixie/doc/en/html1.jpg
-share/kde/apps/pixie/doc/en/html2.jpg
-share/kde/apps/pixie/doc/en/html3.jpg
-share/kde/apps/pixie/doc/en/html4.jpg
-share/kde/apps/pixie/doc/en/html5.jpg
-share/kde/apps/pixie/doc/en/html6.jpg
-share/kde/apps/pixie/doc/en/html7.jpg
-share/kde/apps/pixie/doc/en/html8.jpg
-share/kde/apps/pixie/doc/en/htmlexport.html
-share/kde/apps/pixie/doc/en/htmllogo.jpg
-share/kde/apps/pixie/doc/en/index.html
-share/kde/apps/pixie/doc/en/layout.html
-share/kde/apps/pixie/doc/en/layout2.jpg
-share/kde/apps/pixie/doc/en/liquid/liquid.html
-share/kde/apps/pixie/doc/en/liquid/thb_addtext.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_back.png
-share/kde/apps/pixie/doc/en/liquid/thb_borders.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_browser.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_catagoryadd.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_catagoryselect.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_comparison.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_embedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_filelist.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_format.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_forward.png
-share/kde/apps/pixie/doc/en/liquid/thb_fullscreentb.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_gohome.png
-share/kde/apps/pixie/doc/en/liquid/thb_grayscalepreview.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_hi16-action-catagory.png
-share/kde/apps/pixie/doc/en/liquid/thb_hotlist.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_htmllogo.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_layout2.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_lowquality.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_noembedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_nothumb.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_pixielogo.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_scale.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_screenshot.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_similarprogress.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_slideshow.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_stop.png
-share/kde/apps/pixie/doc/en/liquid/thb_thumb.png
-share/kde/apps/pixie/doc/en/liquid/thb_thumbnailed.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_tooltip.jpg.png
-share/kde/apps/pixie/doc/en/liquid/thb_up.png
-share/kde/apps/pixie/doc/en/list/list.html
-share/kde/apps/pixie/doc/en/list/list2.html
-share/kde/apps/pixie/doc/en/list/list3.html
-share/kde/apps/pixie/doc/en/lowquality.jpg
-share/kde/apps/pixie/doc/en/navigate.html
-share/kde/apps/pixie/doc/en/noembedthumbnail.jpg
-share/kde/apps/pixie/doc/en/nothumb.jpg
-share/kde/apps/pixie/doc/en/pixielogo.jpg
-share/kde/apps/pixie/doc/en/previewoptions.html
-share/kde/apps/pixie/doc/en/rightclick.html
-share/kde/apps/pixie/doc/en/roundcorner/roundcorner.html
-share/kde/apps/pixie/doc/en/roundcorner/thb_addtext.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_back.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_borders.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_browser.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_catagoryadd.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_catagoryselect.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_comparison.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_embedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_filelist.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_format.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_forward.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_fullscreentb.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_gohome.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_grayscalepreview.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_hi16-action-catagory.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_hotlist.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_htmllogo.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_layout2.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_lowquality.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_noembedthumbnail.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_nothumb.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_pixielogo.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_scale.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_screenshot.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_similarprogress.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_slideshow.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_stop.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_thumb.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_thumbnailed.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_tooltip.jpg.png
-share/kde/apps/pixie/doc/en/roundcorner/thb_up.png
-share/kde/apps/pixie/doc/en/scale.jpg
-share/kde/apps/pixie/doc/en/screenshot.html
-share/kde/apps/pixie/doc/en/screenshot.jpg
-share/kde/apps/pixie/doc/en/similarprogress.jpg
-share/kde/apps/pixie/doc/en/slideshow.html
-share/kde/apps/pixie/doc/en/slideshow.jpg
-share/kde/apps/pixie/doc/en/stop.png
-share/kde/apps/pixie/doc/en/thumb.png
-share/kde/apps/pixie/doc/en/thumbnailed.jpg
-share/kde/apps/pixie/doc/en/tooltip.jpg
-share/kde/apps/pixie/doc/en/up.png
-share/kde/apps/pixie/doc/en/viewingimages.html
-share/kde/apps/pixie/doc/en/viewingthumbnails.html
-share/kde/apps/pixie/pixielogo.jpg
-share/kde/apps/pixie/toolbar/kwin.png
-share/kde/apps/pixie/toolbar/mini-ray.png
-share/kde/apps/pixie/toolbar/mini-run.png
-share/kde/mimelnk/image/x-miff.desktop
-share/kde/mimelnk/image/x-pict.desktop
-share/kde/mimelnk/image/x-tga.desktop
-share/kde/mimelnk/image/x-xwd.desktop
diff --git a/graphics/pixieplus/distinfo b/graphics/pixieplus/distinfo
deleted file mode 100644
index c8f41313cef..00000000000
--- a/graphics/pixieplus/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/06/21 21:00:49 joerg Exp $
-
-SHA1 (pixieplus-0.5.4.tar.gz) = bea6ce3e030fecb9ecceaaf85d155ccc9a4550d5
-RMD160 (pixieplus-0.5.4.tar.gz) = 73c164e8bd66f045c09b9396e2ce777d6daca363
-Size (pixieplus-0.5.4.tar.gz) = 2297945 bytes
-SHA1 (patch-aa) = e9383e025b871ce6629f5924eec3f2bf305c0df4
-SHA1 (patch-ab) = 8b8530ad5d0827504947d9c798efda2e11e0f415
-SHA1 (patch-ac) = 38824b02aba0695e025fe3995f31bc376dd44518
-SHA1 (patch-ad) = fea08f39973b532be38b758ce697ac139c708bd3
-SHA1 (patch-ae) = e9d4ca1bede5f07d79d2d6a5bc5b2d97f298a93f
-SHA1 (patch-af) = 42b4d4dfef5c286ae703ed6b4ce7813865142bf1
-SHA1 (patch-ag) = d3ab5cf53d4ad22b08e14dc4d0e763d1ea962159
-SHA1 (patch-ah) = a06fe1e575892283441c8399b95c5d8b314d3af7
-SHA1 (patch-ai) = 143a146e0e8544f9fa95c7a2d7ebdc08ee1855ab
-SHA1 (patch-aj) = 84d0813e3d1a90aad583efa5f018a2fccf6a2f10
-SHA1 (patch-ak) = d1f5dd591396c6cdcc1a54297875424fb9883995
-SHA1 (patch-al) = f0239380ce03e3d9d83b6905e8bebfbfbded9849
-SHA1 (patch-am) = 0333d1c6d7476c5da6fb30c2aee957427f3973e4
-SHA1 (patch-an) = 0d0f560fe4c23857f3c816324b52f7ed8e882527
diff --git a/graphics/pixieplus/patches/patch-aa b/graphics/pixieplus/patches/patch-aa
deleted file mode 100644
index 98bfb693c15..00000000000
--- a/graphics/pixieplus/patches/patch-aa
+++ /dev/null
@@ -1,652 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/12/14 12:16:43 markd Exp $
-
---- app/compressedgif.cpp.orig 2003-02-09 17:56:50.000000000 +1300
-+++ app/compressedgif.cpp
-@@ -9,6 +9,51 @@
- #include <api.h>
- #include <assert.h>
-
-+/* from <magick/{blob,exception,image}_private.h> */
-+extern "C" {
-+
-+typedef enum
-+{
-+ UndefinedBlobMode,
-+ ReadBlobMode,
-+ ReadBinaryBlobMode,
-+ WriteBlobMode,
-+ WriteBinaryBlobMode,
-+ IOBinaryBlobMode
-+} BlobMode;
-+
-+extern MagickExport MagickBooleanType
-+ OpenBlob(const ImageInfo *,Image *,const BlobMode,ExceptionInfo *);
-+
-+extern MagickExport ssize_t
-+ WriteBlob(Image *,const size_t,const unsigned char *),
-+ WriteBlobByte(Image *,const unsigned char),
-+ WriteBlobLSBShort(Image *,const unsigned short);
-+
-+extern MagickExport void
-+ CloseBlob(Image *);
-+
-+
-+extern MagickExport const char
-+ *SaveImageTag,
-+ *SaveImagesTag;
-+
-+}
-+
-+#define ThrowWriterException(severity,tag) \
-+{ \
-+ assert(image != (Image *) NULL); \
-+ (void) ThrowMagickException(&image->exception,GetMagickModule(),severity, \
-+ tag,image->filename); \
-+ if (image_info->adjoin != MagickFalse) \
-+ while (image->previous != (Image *) NULL) \
-+ image=image->previous; \
-+ CloseBlob(image); \
-+ return(MagickFalse); \
-+}
-+
-+/* end of defns from <magick/{blob,exception,image}_private.h> */
-+
- #ifndef False
- #define False 0
- #endif
-@@ -40,31 +85,31 @@ unsigned int EncodeCompressedGIFImage(co
- Image *image,
- const unsigned int data_size)
- {
--#define MaxCode(number_bits) ((1 << (number_bits))-1)
-+#define MaxCode(number_bits) ((1UL << (number_bits))-1)
- #define MaxHashTable 5003
--#define MaxGIFBits 12
--#define MaxGIFTable (1 << MaxGIFBits)
-+#define MaxGIFBits 12UL
-+#define MaxGIFTable (1UL << MaxGIFBits)
- #define GIFOutputCode(code) \
- { \
- /* \
- Emit a code. \
- */ \
- if (bits > 0) \
-- datum|=((long) code << bits); \
-+ datum|=(code) << bits; \
- else \
-- datum=(long) code; \
-+ datum=code; \
- bits+=number_bits; \
- while (bits >= 8) \
- { \
- /* \
- Add a character to current packet. \
- */ \
-- packet[byte_count++]=(unsigned char) (datum & 0xff); \
-- if (byte_count >= 254) \
-+ packet[length++]=(unsigned char) (datum & 0xff); \
-+ if (length >= 254) \
- { \
-- (void) WriteBlobByte(image,byte_count); \
-- (void) WriteBlob(image,byte_count,(char *) packet); \
-- byte_count=0; \
-+ (void) WriteBlobByte(image,(unsigned char) length); \
-+ (void) WriteBlob(image,length,packet); \
-+ length=0; \
- } \
- datum>>=8; \
- bits-=8; \
-@@ -79,18 +124,14 @@ unsigned int EncodeCompressedGIFImage(co
- } \
- }
-
-- int
-- displacement,
-- next_pixel,
-- bits,
-- byte_count,
-- k,
-- number_bits,
-- offset,
-- pass;
-+
-+ IndexPacket
-+ index;
-
- long
-- datum,
-+ displacement,
-+ offset,
-+ k,
- y;
-
- register const PixelPacket
-@@ -103,28 +144,40 @@ unsigned int EncodeCompressedGIFImage(co
- i,
- x;
-
-+ size_t
-+ length;
-+
- short
-- clear_code,
-- end_of_information_code,
-- free_code,
- *hash_code,
- *hash_prefix,
-- index,
-- max_code,
- waiting_code;
-
- unsigned char
- *packet,
- *hash_suffix;
-
-+ unsigned int
-+ status;
-+
-+ unsigned long
-+ bits,
-+ clear_code,
-+ datum,
-+ end_of_information_code,
-+ free_code,
-+ max_code,
-+ next_pixel,
-+ number_bits,
-+ pass;
-+
- /*
- Allocate encoder tables.
- */
- assert(image != (Image *) NULL);
-- packet=(unsigned char *) AcquireMemory(256);
-- hash_code=(short *) AcquireMemory(MaxHashTable*sizeof(short));
-- hash_prefix=(short *) AcquireMemory(MaxHashTable*sizeof(short));
-- hash_suffix=(unsigned char *) AcquireMemory(MaxHashTable);
-+ packet=(unsigned char *) AcquireMagickMemory(256);
-+ hash_code=(short *) AcquireMagickMemory(MaxHashTable*sizeof(short));
-+ hash_prefix=(short *) AcquireMagickMemory(MaxHashTable*sizeof(short));
-+ hash_suffix=(unsigned char *) AcquireMagickMemory(MaxHashTable);
- if ((packet == (unsigned char *) NULL) || (hash_code == (short *) NULL) ||
- (hash_prefix == (short *) NULL) ||
- (hash_suffix == (unsigned char *) NULL))
-@@ -137,7 +190,7 @@ unsigned int EncodeCompressedGIFImage(co
- clear_code=((short) 1 << (data_size-1));
- end_of_information_code=clear_code+1;
- free_code=clear_code+2;
-- byte_count=0;
-+ length=0;
- datum=0;
- bits=0;
- for (i=0; i < MaxHashTable; i++)
-@@ -156,7 +209,7 @@ unsigned int EncodeCompressedGIFImage(co
- break;
- indexes=GetIndexes(image);
- if (y == 0)
-- waiting_code=(*indexes);
-+ waiting_code=(short) (*indexes);
- for (x=(y == 0) ? 1 : 0; x < (long) image->columns; x++)
- {
- /*
-@@ -164,14 +217,15 @@ unsigned int EncodeCompressedGIFImage(co
- */
- index=indexes[x] & 0xff;
- p++;
-- k=(int) ((int) index << (MaxGIFBits-8))+waiting_code;
-+ k=(int) (index << (MaxGIFBits-8))+waiting_code;
- if (k >= MaxHashTable)
- k-=MaxHashTable;
- next_pixel=false;
- displacement=1;
- if ((image_info->compression != NoCompression) && (hash_code[k] > 0))
- {
-- if ((hash_prefix[k] == waiting_code) && (hash_suffix[k] == index))
-+ if ((hash_prefix[k] == waiting_code) &&
-+ (hash_suffix[k] == (unsigned char) index))
- {
- waiting_code=hash_code[k];
- continue;
-@@ -185,7 +239,8 @@ unsigned int EncodeCompressedGIFImage(co
- k+=MaxHashTable;
- if (hash_code[k] == 0)
- break;
-- if ((hash_prefix[k] == waiting_code) && (hash_suffix[k] == index))
-+ if ((hash_prefix[k] == waiting_code) &&
-+ (hash_suffix[k] == (unsigned char) index))
- {
- waiting_code=hash_code[k];
- next_pixel=true;
-@@ -195,10 +250,10 @@ unsigned int EncodeCompressedGIFImage(co
- if (next_pixel == true)
- continue;
- }
-- GIFOutputCode(waiting_code);
-+ GIFOutputCode((unsigned long) waiting_code);
- if (free_code < MaxGIFTable)
- {
-- hash_code[k]=free_code++;
-+ hash_code[k]=(short) free_code++;
- hash_prefix[k]=waiting_code;
- hash_suffix[k]=(unsigned char) index;
- }
-@@ -217,7 +272,7 @@ unsigned int EncodeCompressedGIFImage(co
- number_bits=data_size;
- max_code=MaxCode(number_bits);
- }
-- waiting_code=index;
-+ waiting_code=(short) index;
- }
- if (image_info->interlace == NoInterlace)
- offset++;
-@@ -263,42 +318,45 @@ unsigned int EncodeCompressedGIFImage(co
- }
- if (image->previous == (Image *) NULL)
- if (QuantumTick(y,image->rows))
-- if (!MagickMonitor(SaveImageTag,y,image->rows,&image->exception))
-- break;
-+ {
-+ status=MagickMonitor(SaveImageTag,y,image->rows,&image->exception);
-+ if (status == false)
-+ break;
-+ }
- }
- /*
- Flush out the buffered code.
- */
-- GIFOutputCode(waiting_code);
-+ GIFOutputCode((unsigned long) waiting_code);
- GIFOutputCode(end_of_information_code);
- if (bits > 0)
- {
- /*
- Add a character to current packet.
- */
-- packet[byte_count++]=(unsigned char) (datum & 0xff);
-- if (byte_count >= 254)
-+ packet[length++]=(unsigned char) (datum & 0xff);
-+ if (length >= 254)
- {
-- (void) WriteBlobByte(image,byte_count);
-- (void) WriteBlob(image,byte_count,(char *) packet);
-- byte_count=0;
-+ (void) WriteBlobByte(image,(unsigned char) length);
-+ (void) WriteBlob(image,length,packet);
-+ length=0;
- }
- }
- /*
- Flush accumulated data.
- */
-- if (byte_count > 0)
-+ if (length > 0)
- {
-- (void) WriteBlobByte(image,byte_count);
-- (void) WriteBlob(image,byte_count,(char *) packet);
-+ (void) WriteBlobByte(image,(unsigned char) length);
-+ (void) WriteBlob(image,length,packet);
- }
- /*
- Free encoder memory.
- */
-- LiberateMemory((void **) &hash_suffix);
-- LiberateMemory((void **) &hash_prefix);
-- LiberateMemory((void **) &hash_code);
-- LiberateMemory((void **) &packet);
-+ hash_suffix=(unsigned char *) RelinquishMagickMemory(hash_suffix);
-+ hash_prefix=(short *) RelinquishMagickMemory(hash_prefix);
-+ hash_code=(short *) RelinquishMagickMemory(hash_code);
-+ packet=(unsigned char *) RelinquishMagickMemory(packet);
- return(true);
- }
-
-@@ -308,10 +366,15 @@ unsigned int WriteCompressedGIFImage(con
- *next_image;
-
- int
-+ c;
-+
-+ long
-+ j,
-+ opacity,
- y;
-
-- long
-- opacity;
-+ MagickOffsetType
-+ scene;
-
- QuantizeInfo
- quantize_info;
-@@ -335,11 +398,9 @@ unsigned int WriteCompressedGIFImage(con
- *q;
-
- size_t
-- j;
-+ length;
-
- unsigned char
-- bits_per_pixel,
-- c,
- *colormap,
- *global_colormap;
-
-@@ -348,7 +409,7 @@ unsigned int WriteCompressedGIFImage(con
- status;
-
- unsigned long
-- scene;
-+ bits_per_pixel;
-
- /*
- Open output image file.
-@@ -357,9 +418,11 @@ unsigned int WriteCompressedGIFImage(con
- assert(image_info->signature == MagickSignature);
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
-+ if (image->debug != false)
-+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),image->filename);
- status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
- if (status == false)
-- ThrowWriterException(FileOpenError,"Unable to open file",image);
-+ return(status);
- /*
- Determine image bounding box.
- */
-@@ -380,37 +443,36 @@ unsigned int WriteCompressedGIFImage(con
- /*
- Allocate colormap.
- */
-- global_colormap=(unsigned char *) AcquireMemory(768);
-- colormap=(unsigned char *) AcquireMemory(768);
-+ global_colormap=(unsigned char *) AcquireMagickMemory(768);
-+ colormap=(unsigned char *) AcquireMagickMemory(768);
- if ((global_colormap == (unsigned char *) NULL) ||
- (colormap == (unsigned char *) NULL))
-- ThrowWriterException(ResourceLimitError,"Memory allocation failed",image);
-+ ThrowWriterException(ResourceLimitError,"Memory allocation failed");
- for (i=0; i < 768; i++)
-- colormap[i]=0;
-+ colormap[i]=(unsigned char) 0;
- /*
- Write GIF header.
- */
- if ((GetImageAttribute(image,"comment") == (ImageAttribute *) NULL) &&
-- !image_info->adjoin && !image->matte)
-- (void) WriteBlob(image,6,"GIF87a");
-+ (image_info->adjoin == false) && (image->matte == false))
-+ (void) WriteBlob(image,6,(unsigned char *) "GIF87a");
- else
- if (LocaleCompare(image_info->magick,"GIF87") == 0)
-- (void) WriteBlob(image,6,"GIF87a");
-+ (void) WriteBlob(image,6,(unsigned char *) "GIF87a");
- else
-- (void) WriteBlob(image,6,"GIF89a");
-+ (void) WriteBlob(image,6,(unsigned char *) "GIF89a");
- page.x=image->page.x;
- page.y=image->page.y;
- if ((image->page.width != 0) && (image->page.height != 0))
- page=image->page;
-- (void) WriteBlobLSBShort(image,page.width);
-- (void) WriteBlobLSBShort(image,page.height);
-+ (void) WriteBlobLSBShort(image,(unsigned short) page.width);
-+ (void) WriteBlobLSBShort(image,(unsigned short) page.height);
- /*
- Write images to file.
- */
- interlace=image_info->interlace;
-- if (image_info->adjoin && (image->next != (Image *) NULL))
-+ if ((image_info->adjoin != false) && (image->next != (Image *) NULL))
- interlace=NoInterlace;
-- opacity=(-1);
- scene=0;
- do
- {
-@@ -422,22 +484,24 @@ unsigned int WriteCompressedGIFImage(con
- */
- GetQuantizeInfo(&quantize_info);
- quantize_info.dither=image_info->dither;
-- quantize_info.number_colors=image->matte ? 255 : 256;
-+ quantize_info.number_colors=(unsigned long)
-+ (image->matte != false ? 255 : 256);
- (void) QuantizeImage(&quantize_info,image);
-- if (image->matte)
-+ if (image->matte != false)
- {
- /*
- Set transparent pixel.
- */
- opacity=(long) image->colors++;
-- ReacquireMemory((void **) &image->colormap,
-- image->colors*sizeof(PixelPacket));
-+ image->colormap=(PixelPacket *) ResizeMagickMemory(image->colormap,
-+ (size_t) image->colors*sizeof(PixelPacket));
- if (image->colormap == (PixelPacket *) NULL)
- {
-- LiberateMemory((void **) &global_colormap);
-- LiberateMemory((void **) &colormap);
-+ global_colormap=(unsigned char *)
-+ RelinquishMagickMemory(global_colormap);
-+ colormap=(unsigned char *) RelinquishMagickMemory(colormap);
- ThrowWriterException(ResourceLimitError,
-- "Memory allocation failed",image)
-+ "Memory allocation failed")
- }
- image->colormap[opacity]=image->background_color;
- for (y=0; y < (long) image->rows; y++)
-@@ -449,17 +513,17 @@ unsigned int WriteCompressedGIFImage(con
- indexes=GetIndexes(image);
- for (x=0; x < (long) image->columns; x++)
- {
-- if (p->opacity == TransparentOpacity)
-+ if ((double) p->opacity > image->fuzz)
- indexes[x]=(IndexPacket) opacity;
- p++;
- }
-- if (!SyncImagePixels(image))
-+ if (SyncImagePixels(image) == false)
- break;
- }
- }
- }
- else
-- if (image->matte)
-+ if (image->matte != false)
- {
- /*
- Identify transparent pixel index.
-@@ -472,7 +536,7 @@ unsigned int WriteCompressedGIFImage(con
- indexes=GetIndexes(image);
- for (x=0; x < (long) image->columns; x++)
- {
-- if (p->opacity == TransparentOpacity)
-+ if ((double) p->opacity > image->fuzz)
- {
- opacity=(long) indexes[x];
- break;
-@@ -495,13 +559,13 @@ unsigned int WriteCompressedGIFImage(con
- *q++=ScaleQuantumToChar(image->colormap[i].green);
- *q++=ScaleQuantumToChar(image->colormap[i].blue);
- }
-- for ( ; i < (1L << bits_per_pixel); i++)
-+ for ( ; i < (long) (1UL << bits_per_pixel); i++)
- {
-- *q++=(Quantum) 0x0;
-- *q++=(Quantum) 0x0;
-- *q++=(Quantum) 0x0;
-+ *q++=(unsigned char) 0x0;
-+ *q++=(unsigned char) 0x0;
-+ *q++=(unsigned char) 0x0;
- }
-- if ((image->previous == (Image *) NULL) || !image_info->adjoin)
-+ if ((image->previous == (Image *) NULL) || (image_info->adjoin == false))
- {
- /*
- Write global colormap.
-@@ -509,13 +573,14 @@ unsigned int WriteCompressedGIFImage(con
- c=0x80;
- c|=(8-1) << 4; /* color resolution */
- c|=(bits_per_pixel-1); /* size of global colormap */
-- (void) WriteBlobByte(image,c);
-- for (j=0; j < Max(image->colors-1,1); j++)
-+ (void) WriteBlobByte(image,(unsigned char) c);
-+ for (j=0; j < (long) Max(image->colors-1,1); j++)
- if (FuzzyColorMatch(&image->background_color,image->colormap+j,0))
- break;
-- (void) WriteBlobByte(image,(long) j); /* background color */
-- (void) WriteBlobByte(image,0x0); /* reserved */
-- (void) WriteBlob(image,3*(1 << bits_per_pixel),(char *) colormap);
-+ (void) WriteBlobByte(image,(unsigned char) j); /* background color */
-+ (void) WriteBlobByte(image,(unsigned char) 0x0); /* reserved */
-+ length=(size_t) (3*(1 << bits_per_pixel));
-+ (void) WriteBlob(image,length,colormap);
- for (j=0; j < 768; j++)
- global_colormap[j]=colormap[j];
- }
-@@ -524,16 +589,17 @@ unsigned int WriteCompressedGIFImage(con
- /*
- Write Graphics Control extension.
- */
-- (void) WriteBlobByte(image,0x21);
-- (void) WriteBlobByte(image,0xf9);
-- (void) WriteBlobByte(image,0x04);
-- c=(unsigned char) ((int) image->dispose << 2);
-+ (void) WriteBlobByte(image,(unsigned char) 0x21);
-+ (void) WriteBlobByte(image,(unsigned char) 0xf9);
-+ (void) WriteBlobByte(image,(unsigned char) 0x04);
-+ c=((image->dispose) << 2);
- if (opacity >= 0)
- c|=0x01;
-- (void) WriteBlobByte(image,c);
-- (void) WriteBlobLSBShort(image,image->delay);
-- (void) WriteBlobByte(image,opacity >= 0 ? opacity : 0);
-- (void) WriteBlobByte(image,0x00);
-+ (void) WriteBlobByte(image,(unsigned char) c);
-+ (void) WriteBlobLSBShort(image,(unsigned short) image->delay);
-+ (void) WriteBlobByte(image,(unsigned char)
-+ (opacity >= 0 ? opacity : 0));
-+ (void) WriteBlobByte(image,(unsigned char) 0x00);
- if (GetImageAttribute(image,"comment") != (ImageAttribute *) NULL)
- {
- const ImageAttribute
-@@ -548,18 +614,18 @@ unsigned int WriteCompressedGIFImage(con
- /*
- Write Comment extension.
- */
-- (void) WriteBlobByte(image,0x21);
-- (void) WriteBlobByte(image,0xfe);
-+ (void) WriteBlobByte(image,(unsigned char) 0x21);
-+ (void) WriteBlobByte(image,(unsigned char) 0xfe);
- attribute=GetImageAttribute(image,"comment");
- p=attribute->value;
- while (strlen(p) != 0)
- {
- count=Min(strlen(p),255);
-- (void) WriteBlobByte(image,(long) count);
-+ (void) WriteBlobByte(image,(unsigned char) count);
- for (i=0; i < (long) count; i++)
-- (void) WriteBlobByte(image,*p++);
-+ (void) WriteBlobByte(image,(unsigned char) *p++);
- }
-- (void) WriteBlobByte(image,0x0);
-+ (void) WriteBlobByte(image,(unsigned char) 0x00);
- }
- if ((image->previous == (Image *) NULL) &&
- (image->next != (Image *) NULL) && (image->iterations != 1))
-@@ -567,14 +633,14 @@ unsigned int WriteCompressedGIFImage(con
- /*
- Write Netscape Loop extension.
- */
-- (void) WriteBlobByte(image,0x21);
-- (void) WriteBlobByte(image,0xff);
-- (void) WriteBlobByte(image,0x0b);
-- (void) WriteBlob(image,11,"NETSCAPE2.0");
-- (void) WriteBlobByte(image,0x03);
-- (void) WriteBlobByte(image,0x01);
-- (void) WriteBlobLSBShort(image,image->iterations);
-- (void) WriteBlobByte(image,0x00);
-+ (void) WriteBlobByte(image,(unsigned char) 0x21);
-+ (void) WriteBlobByte(image,(unsigned char) 0xff);
-+ (void) WriteBlobByte(image,(unsigned char) 0x0b);
-+ (void) WriteBlob(image,11,(unsigned char *) "NETSCAPE2.0");
-+ (void) WriteBlobByte(image,(unsigned char) 0x03);
-+ (void) WriteBlobByte(image,(unsigned char) 0x01);
-+ (void) WriteBlobLSBShort(image,(unsigned short) image->iterations);
-+ (void) WriteBlobByte(image,(unsigned char) 0x00);
- }
- }
- (void) WriteBlobByte(image,','); /* image separator */
-@@ -585,51 +651,50 @@ unsigned int WriteCompressedGIFImage(con
- page.y=image->page.y;
- if ((image->page.width != 0) && (image->page.height != 0))
- page=image->page;
-- (void) WriteBlobLSBShort(image,page.x);
-- (void) WriteBlobLSBShort(image,page.y);
-- (void) WriteBlobLSBShort(image,image->columns);
-- (void) WriteBlobLSBShort(image,image->rows);
-+ (void) WriteBlobLSBShort(image,(unsigned short) (page.x < 0 ? 0 : page.x));
-+ (void) WriteBlobLSBShort(image,(unsigned short) (page.y < 0 ? 0 : page.y));
-+ (void) WriteBlobLSBShort(image,(unsigned short) image->columns);
-+ (void) WriteBlobLSBShort(image,(unsigned short) image->rows);
- c=0x00;
- if (interlace != NoInterlace)
- c|=0x40; /* pixel data is interlaced */
-- for (j=0; j < (3*image->colors); j++)
-+ for (j=0; j < (long) (3*image->colors); j++)
- if (colormap[j] != global_colormap[j])
- break;
-- if (j == (3*image->colors))
-- (void) WriteBlobByte(image,c);
-+ if (j == (long) (3*image->colors))
-+ (void) WriteBlobByte(image,(unsigned char) c);
- else
- {
- c|=0x80;
- c|=(bits_per_pixel-1); /* size of local colormap */
-- (void) WriteBlobByte(image,c);
-- (void) WriteBlob(image,3*(1 << bits_per_pixel),(char *) colormap);
-+ (void) WriteBlobByte(image,(unsigned char) c);
-+ length=(size_t) (3*(1UL << bits_per_pixel));
-+ (void) WriteBlob(image,length,colormap);
- }
- /*
- Write the image data.
- */
-- c=Max(bits_per_pixel,2);
-- (void) WriteBlobByte(image,c);
-+ c=(int) Max(bits_per_pixel,2);
-+ (void) WriteBlobByte(image,(unsigned char) c);
- status=EncodeCompressedGIFImage(image_info,image,Max(bits_per_pixel,2)+1);
- if (status == false)
- {
-- LiberateMemory((void **) &global_colormap);
-- LiberateMemory((void **) &colormap);
-- ThrowWriterException(ResourceLimitError,"Memory allocation failed",
-- image)
-+ global_colormap=(unsigned char *)
-+ RelinquishMagickMemory(global_colormap);
-+ colormap=(unsigned char *) RelinquishMagickMemory(colormap);
-+ ThrowWriterException(ResourceLimitError,"Memory allocation failed");
- }
-- (void) WriteBlobByte(image,0x0);
-+ (void) WriteBlobByte(image,(unsigned char) 0x00);
- if (image->next == (Image *) NULL)
- break;
- image=GetNextImage(image);
-- if (!MagickMonitor(SaveImagesTag,scene++,GetImageListSize(image),&image->exception))
-+ status=MagickMonitor(SaveImagesTag,scene++,GetImageListSize(image),&image->exception);
-+ if (status == false)
- break;
-- } while (image_info->adjoin);
-+ } while (image_info->adjoin != false);
- (void) WriteBlobByte(image,';'); /* terminator */
-- LiberateMemory((void **) &global_colormap);
-- LiberateMemory((void **) &colormap);
-- if (image_info->adjoin)
-- while (image->previous != (Image *) NULL)
-- image=image->previous;
-+ global_colormap=(unsigned char *) RelinquishMagickMemory(global_colormap);
-+ colormap=(unsigned char *) RelinquishMagickMemory(colormap);
- CloseBlob(image);
- return(true);
- }
diff --git a/graphics/pixieplus/patches/patch-ab b/graphics/pixieplus/patches/patch-ab
deleted file mode 100644
index 685e3aeaeeb..00000000000
--- a/graphics/pixieplus/patches/patch-ab
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/06/15 13:24:44 markd Exp $
-
---- configure.orig 2004-06-16 00:41:14.000000000 +1200
-+++ configure
-@@ -21614,51 +21614,6 @@ echo "$as_me: error: Cannot find ImageMa
- { (exit 1); exit 1; }; }
- fi
-
--echo "$as_me:21617: checking for magick/resource.h" >&5
--echo $ECHO_N "checking for magick/resource.h... $ECHO_C" >&6
--if test "${ac_cv_header_magick_resource_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--#line 21623 "configure"
--#include "confdefs.h"
--#include <magick/resource.h>
--_ACEOF
--if { (eval echo "$as_me:21627: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- egrep -v '^ *\+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:21633: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- ac_cv_header_magick_resource_h=yes
--else
-- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- ac_cv_header_magick_resource_h=no
--fi
--rm -f conftest.err conftest.$ac_ext
--fi
--echo "$as_me:21652: result: $ac_cv_header_magick_resource_h" >&5
--echo "${ECHO_T}$ac_cv_header_magick_resource_h" >&6
--if test $ac_cv_header_magick_resource_h = yes; then
-- :
--else
-- { { echo "$as_me:21657: error: Old ImageMagick headers found. You must have ImageMagick 5.5.0 or above. Read INSTALL.README!" >&5
--echo "$as_me: error: Old ImageMagick headers found. You must have ImageMagick 5.5.0 or above. Read INSTALL.README!" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
- MAGICKPREFIX=`Magick-config --prefix`
- echo ImageMagick prefix $MAGICKPREFIX
-
diff --git a/graphics/pixieplus/patches/patch-ac b/graphics/pixieplus/patches/patch-ac
deleted file mode 100644
index f5b76665b86..00000000000
--- a/graphics/pixieplus/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/09/11 12:11:53 markd Exp $
-
---- app/ifapp.cpp.orig 2003-02-09 17:56:50.000000000 +1300
-+++ app/ifapp.cpp
-@@ -33,18 +33,18 @@ int xioErrorHandler(Display *dpy);
-
- // ImageMagick message and progress stubs
- extern "C"{
-- unsigned int magickMonitor(const char *msg, const off_t value,
-- const size_t span, ExceptionInfo *)
-+ MagickBooleanType magickMonitor(const char *msg, const off_t value,
-+ const MagickSizeType span, ExceptionInfo *)
- {
- if(!appPtr)
-- return(true);
-+ return(MagickTrue);
- int val = (int)((((float)value)/((float)span))*100.0);
- if(appPtr->magickMessageProgress())
- appPtr->magickMessageProgress()->setValue(val);
- if(appPtr->magickMessageLabel())
- appPtr->magickMessageLabel()->setText(msg);
- appPtr->processEvents();
-- return(true);
-+ return(MagickTrue);
- }
-
- void magickWarning(const ExceptionType /*warning*/, const char *reason,
diff --git a/graphics/pixieplus/patches/patch-ad b/graphics/pixieplus/patches/patch-ad
deleted file mode 100644
index 3111b57f39e..00000000000
--- a/graphics/pixieplus/patches/patch-ad
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/06/21 21:00:49 joerg Exp $
-
---- app/batch.cpp.orig 2003-02-09 04:56:49.000000000 +0000
-+++ app/batch.cpp
-@@ -196,7 +196,7 @@ frequency of the sine wave."), this);
- connect(bbox->addButton(i18n("Cancel")), SIGNAL(clicked()), this,
- SLOT(reject()));
- layout->addWidget(bbox);
--};
-+}
-
- KIFShadeDialog::KIFShadeDialog(QWidget *parent, const char *name)
- : QDialog(parent, name, true)
-@@ -228,7 +228,7 @@ KIFShadeDialog::KIFShadeDialog(QWidget *
- connect(bbox->addButton(i18n("Cancel")), SIGNAL(clicked()), this,
- SLOT(reject()));
- layout->addWidget(bbox);
--};
-+}
-
- KIFTextDialog::KIFTextDialog(QWidget *parent, const char *name)
- : QDialog(parent, name, true)
-@@ -618,9 +618,9 @@ bool BatchEffect::applyMagickEffect(cons
- else if(type == Equalize)
- EqualizeImage(img);
- else if(type == IncContrast)
-- ContrastImage(img, true);
-+ ContrastImage(img, MagickTrue);
- else if(type == DecContrast)
-- ContrastImage(img, false);
-+ ContrastImage(img, MagickFalse);
- else if(type == Solarize)
- SolarizeImage(img, weight);
- else if(type == Threshold)
-@@ -752,7 +752,7 @@ bool BatchEffect::applyMagickEffect(cons
- save = false;
- }
- else if(type == Shade){
-- Image *tmp = ShadeImage(img, useColor, a, e, &exception);
-+ Image *tmp = ShadeImage(img, useColor ? MagickTrue : MagickFalse, a, e, &exception);
- if(tmp){
- if(img->next)
- DestroyImageList(img);
diff --git a/graphics/pixieplus/patches/patch-ae b/graphics/pixieplus/patches/patch-ae
deleted file mode 100644
index e1aa9eccb05..00000000000
--- a/graphics/pixieplus/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/09/11 12:11:53 markd Exp $
-
---- mimetypes/Makefile.in.orig 2004-09-11 23:49:52.000000000 +1200
-+++ mimetypes/Makefile.in
-@@ -240,7 +240,7 @@ x_libraries = @x_libraries@
-
- datadir = $(kde_mimedir)/image
-
--data_DATA = x-pcx.desktop x-xwd.desktop x-miff.desktop x-tga.desktop \
-+data_DATA = x-xwd.desktop x-miff.desktop x-tga.desktop \
- x-pict.desktop
-
-
diff --git a/graphics/pixieplus/patches/patch-af b/graphics/pixieplus/patches/patch-af
deleted file mode 100644
index acd0089ec7d..00000000000
--- a/graphics/pixieplus/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/11/14 08:42:44 markd Exp $
-
---- app/imageheaders.cpp.orig 2005-11-14 20:44:06.000000000 +1300
-+++ app/imageheaders.cpp
-@@ -90,7 +90,7 @@ bool checkTIFFThumbnail(const char *file
- if(TIFFSetDirectory(t, thumbDir)){
- TIFFGetField(t, TIFFTAG_IMAGELENGTH, &height);
- img.create(minWidth, height, 32);
-- if(!TIFFReadRGBAImage(t, minWidth, height, (unsigned long*)
-+ if(!TIFFReadRGBAImage(t, minWidth, height, (uint32*)
- img.bits(), 0))
- img.reset();
- else{
diff --git a/graphics/pixieplus/patches/patch-ag b/graphics/pixieplus/patches/patch-ag
deleted file mode 100644
index d9feae4b53c..00000000000
--- a/graphics/pixieplus/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- misc/qxcfi.cpp.orig 2006-06-21 19:17:12.000000000 +0000
-+++ misc/qxcfi.cpp
-@@ -1342,7 +1342,11 @@ void XCFImageFormat::assignMaskBytes ( L
- bool XCFImageFormat::loadProperty ( QDataStream& xcf_io, PropType& type,
- QByteArray& bytes )
- {
-- xcf_io >> (Q_UINT32)type;
-+ {
-+ Q_UINT32 type_tmp = type;
-+ xcf_io >> type_tmp;
-+ type = (PropType)type_tmp;
-+ }
-
- if ( xcf_io.device()->status() != IO_Ok ) {
- qDebug( "XCF: read failure on property type" );
diff --git a/graphics/pixieplus/patches/patch-ah b/graphics/pixieplus/patches/patch-ah
deleted file mode 100644
index 7f68e41ce61..00000000000
--- a/graphics/pixieplus/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/batch.h.orig 2006-06-21 19:24:54.000000000 +0000
-+++ app/batch.h
-@@ -17,7 +17,7 @@
- #define off_t long long
- extern "C"{
- #include <api.h>
--};
-+}
-
- class KProgress;
- class QLabel;
diff --git a/graphics/pixieplus/patches/patch-ai b/graphics/pixieplus/patches/patch-ai
deleted file mode 100644
index 70e3c349137..00000000000
--- a/graphics/pixieplus/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/ifapp.h.orig 2006-06-21 19:25:21.000000000 +0000
-+++ app/ifapp.h
-@@ -14,7 +14,7 @@
- #define off_t long long
- extern "C"{
- #include <api.h>
--};
-+}
-
- class KIFFileList;
- class KIFImage;
diff --git a/graphics/pixieplus/patches/patch-aj b/graphics/pixieplus/patches/patch-aj
deleted file mode 100644
index 93ad8b8cc43..00000000000
--- a/graphics/pixieplus/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/screengrab.cpp.orig 2006-06-21 19:34:54.000000000 +0000
-+++ app/screengrab.cpp
-@@ -125,7 +125,7 @@ with your mouse."), this);
- while(inLoop)
- kapp->processEvents();
- delete this;
--};
-+}
-
- void KIFScreenGrab::slotCheckIfDelay()
- {
diff --git a/graphics/pixieplus/patches/patch-ak b/graphics/pixieplus/patches/patch-ak
deleted file mode 100644
index 239e7596eb7..00000000000
--- a/graphics/pixieplus/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/rightclick.cpp.orig 2006-06-21 19:41:04.000000000 +0000
-+++ app/rightclick.cpp
-@@ -220,9 +220,9 @@ void EditMenu::aboutToShowSlot()
- idx = -1;
- }
- if(idx != -1){
-- QStringList itemList(view->itemCatagories(&itemList[idx]));
-+ QStringList itemList2(view->itemCatagories(&itemList[idx]));
- for(it=catList.begin(), i=1000; it != catList.end(); ++it, ++i){
-- if(itemList.findIndex((*it)) == -1)
-+ if(itemList2.findIndex((*it)) == -1)
- addMnu->insertItem((*it), i);
- else
- delMnu->insertItem((*it), i+1000);
diff --git a/graphics/pixieplus/patches/patch-al b/graphics/pixieplus/patches/patch-al
deleted file mode 100644
index 05431e92742..00000000000
--- a/graphics/pixieplus/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/imageutils.cpp.orig 2006-06-21 19:49:46.000000000 +0000
-+++ app/imageutils.cpp
-@@ -23,7 +23,7 @@
- #define off_t long long
- extern "C"{
- #include <api.h>
--};
-+}
-
- // in compressedgif.cpp
- unsigned int WriteCompressedGIFImage(const ImageInfo *image_info,
diff --git a/graphics/pixieplus/patches/patch-am b/graphics/pixieplus/patches/patch-am
deleted file mode 100644
index 728d59e7a52..00000000000
--- a/graphics/pixieplus/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/main.cpp.orig 2006-06-21 19:57:51.000000000 +0000
-+++ app/main.cpp
-@@ -21,7 +21,7 @@
- #define off_t long long
- extern "C"{
- #include <api.h>
--};
-+}
-
-
- /* Signal handlers. We install them for pretty much everything that can
diff --git a/graphics/pixieplus/patches/patch-an b/graphics/pixieplus/patches/patch-an
deleted file mode 100644
index 8666aa57e20..00000000000
--- a/graphics/pixieplus/patches/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/06/21 21:00:49 joerg Exp $
-
---- app/browser.cpp.orig 2006-06-21 20:23:16.000000000 +0000
-+++ app/browser.cpp
-@@ -36,7 +36,9 @@
-
- #include <unistd.h>
- #include <sys/types.h>
-+extern "C" {
- #include <fnmatch.h>
-+}
- #include <fcntl.h>
- #include <unistd.h>
- #include <math.h>
diff --git a/graphics/pornview/DESCR b/graphics/pornview/DESCR
deleted file mode 100644
index 1dbcf8d0028..00000000000
--- a/graphics/pornview/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-PornView is an image and movie viewer/manager with thumbnail previews.
-Additional features includes thumbnail caching, directory tree views,
-adjustable zoom, fullscreen view, and slideshow mode.
-
-PornView contains no objectionable content.
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
deleted file mode 100644
index b641f1b2d82..00000000000
--- a/graphics/pornview/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2011/01/13 13:38:15 wiz Exp $
-#
-
-PKGNAME= pornview-0.2.0pre1
-DISTNAME= pornview_0.2pre1.orig
-PKGREVISION= 8
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/p/pornview/}
-
-MAINTAINER= dhowland@users.sourceforge.net
-HOMEPAGE= http://pornview.sourceforge.net/
-COMMENT= GTK+ image viewer
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-WRKSRC= ${WRKDIR}/pornview-0.2.0pre1
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-
-USE_TOOLS+= intltool msgfmt perl:run
-REPLACE_PERL+= src/scripts/helloworld
-
-.include "options.mk"
-
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pornview/PLIST b/graphics/pornview/PLIST
deleted file mode 100644
index 0553469df05..00000000000
--- a/graphics/pornview/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:59:25 joerg Exp $
-bin/pornview
-share/gnome/apps/Graphics/pornview.desktop
-share/locale/fr/LC_MESSAGES/pornview.mo
-share/locale/pl/LC_MESSAGES/pornview.mo
-share/pixmaps/pornview.png
-share/pornview/scripts/helloworld
diff --git a/graphics/pornview/TODO b/graphics/pornview/TODO
deleted file mode 100644
index 5158a0b14fe..00000000000
--- a/graphics/pornview/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-Dumps core when compiled with xine support (NetBSD 2.1.0/i386).
-Patch it to use pkgsrc's libexif?
diff --git a/graphics/pornview/distinfo b/graphics/pornview/distinfo
deleted file mode 100644
index cb155850aa1..00000000000
--- a/graphics/pornview/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2009/02/14 18:33:06 joerg Exp $
-
-SHA1 (pornview_0.2pre1.orig.tar.gz) = 3a26412affac6e211da928cc471a4b1bbc55b2a0
-RMD160 (pornview_0.2pre1.orig.tar.gz) = 03a9d01235fafbfb9825da43e79fbfb66a2ecbfa
-Size (pornview_0.2pre1.orig.tar.gz) = 608864 bytes
-SHA1 (patch-aa) = c9a6092bb57619250433b3a80923431d96cfdc19
-SHA1 (patch-ab) = b0c59a238eced5a2480d7c10c06f5c800e087f39
-SHA1 (patch-ac) = a0fc989c301f92e28910251397a73d621a25f4f5
-SHA1 (patch-ad) = 7ba8d060156213552bf1e86143547c692ce4705f
-SHA1 (patch-ae) = 4f87f6357642d5c37baf5124668aeb46e4c2825d
-SHA1 (patch-af) = 1d3a825b8336b508f1a90f88aa5386d9c1ac9f51
diff --git a/graphics/pornview/options.mk b/graphics/pornview/options.mk
deleted file mode 100644
index 2c7f3098f40..00000000000
--- a/graphics/pornview/options.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2006/02/13 15:32:31 rillig Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.pornview
-PKG_SUPPORTED_OPTIONS= exif gtk1
-PKG_OPTIONS_OPTIONAL_GROUPS= movie
-PKG_OPTIONS_GROUP.movie= mplayer xine
-PKG_SUGGESTED_OPTIONS= exif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mexif)
-CONFIGURE_ARGS+= --enable-exif
-.else
-CONFIGURE_ARGS+= --disable-exif
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtk1)
-CONFIGURE_ARGS+= --without-gtk2
-. include "../../graphics/gdk-pixbuf/buildlink3.mk"
-. include "../../x11/gtk/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --with-gtk2
-USE_TOOLS+= pkg-config
-. include "../../devel/glib2/buildlink3.mk"
-. include "../../x11/gtk2/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mmplayer)
-DEPENDS+= mplayer>=1.0rc3:../../multimedia/mplayer
-CONFIGURE_ARGS+= --enable-mplayer
-.elif !empty(PKG_OPTIONS:Mxine)
-. include "../../multimedia/xine-lib/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-xine
-.endif
diff --git a/graphics/pornview/patches/patch-aa b/graphics/pornview/patches/patch-aa
deleted file mode 100644
index 47fddda13f4..00000000000
--- a/graphics/pornview/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/02/11 13:06:43 rillig Exp $
-
---- src/support/image_loader.c.orig 2002-12-16 17:45:36.000000000 +0000
-+++ src/support/image_loader.c
-@@ -81,7 +81,7 @@ static void
- image_loader_stop (ImageLoader * il)
- {
- #ifdef USE_GTK2
-- GError *err;
-+ GError *err = NULL;
- #endif
-
- if (!il)
-@@ -174,7 +174,7 @@ cb_image_loader_idle (gpointer data)
- gint c;
-
- #ifdef USE_GTK2
-- GError *err;
-+ GError *err = NULL;
- #endif
-
- if (!il)
-@@ -241,7 +241,7 @@ image_loader_begin (ImageLoader * il)
- int b;
-
- #ifdef USE_GTK2
-- GError *err;
-+ GError *err = NULL;
- #endif
-
- if (!il->loader || il->pixbuf)
diff --git a/graphics/pornview/patches/patch-ab b/graphics/pornview/patches/patch-ab
deleted file mode 100644
index 2efc13ed4b4..00000000000
--- a/graphics/pornview/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/02/11 13:06:43 rillig Exp $
-
---- src/support/widgets/gtkxine.c.orig 2003-01-03 22:48:21.000000000 +0000
-+++ src/support/widgets/gtkxine.c
-@@ -632,7 +632,7 @@ gtk_xine_unrealize (GtkWidget * widget)
- */
- if (this->vo_driver != NULL)
- xine_close_video_driver (this->xine, this->vo_driver);
-- if (this->vo_driver != NULL)
-+ if (this->ao_driver != NULL)
- xine_close_audio_driver (this->xine, this->ao_driver);
-
- /*
diff --git a/graphics/pornview/patches/patch-ac b/graphics/pornview/patches/patch-ac
deleted file mode 100644
index 93a426a0531..00000000000
--- a/graphics/pornview/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/02/11 13:06:43 rillig Exp $
-
---- src/support/widgets/zlist.c.orig 2002-12-13 10:52:56.000000000 +0000
-+++ src/support/widgets/zlist.c
-@@ -634,7 +634,8 @@ zlist_draw (GtkWidget * widget, GdkRecta
- CELL_X_FROM_COL (list, j), area->y,
- list->cell_x_pad, area->height);
-
-- cell = ZLIST_CELL_FROM_INDEX (list, idx);
-+ if (idx < list->cell_count)
-+ cell = ZLIST_CELL_FROM_INDEX (list, idx);
-
- cell_area.x = CELL_X_FROM_COL (list, j) + list->cell_x_pad;
- cell_area.y = CELL_Y_FROM_ROW (list, i) + list->cell_y_pad;
diff --git a/graphics/pornview/patches/patch-ad b/graphics/pornview/patches/patch-ad
deleted file mode 100644
index 5a9b1d24014..00000000000
--- a/graphics/pornview/patches/patch-ad
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/02/11 13:06:43 rillig Exp $
-
---- src/support/widgets/gtkmplayer.c.orig 2002-12-13 11:15:21.000000000 +0000
-+++ src/support/widgets/gtkmplayer.c
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <ctype.h>
- #include <math.h>
-+#include <signal.h>
-
- #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
-@@ -72,9 +73,9 @@ struct ChildContext_Tag
- int stderr_fd;
- int stdin_fd;
-
-- gchar stdout[GTK_MPLAYER_BUF_SIZE];
-+ gchar stdoutb[GTK_MPLAYER_BUF_SIZE];
- gint stdout_size;
-- gchar stderr[GTK_MPLAYER_BUF_SIZE];
-+ gchar stderrb[GTK_MPLAYER_BUF_SIZE];
- gint stderr_size;
-
- ProcessLineFunc process_line_fn;
-@@ -1049,13 +1050,13 @@ start_command (GtkMPlayer * player, GLis
- context->stdout_fd = out_fd[0];
- fcntl (context->stdout_fd, F_SETFL, O_NONBLOCK);
- close (out_fd[1]);
-- context->stdout[0] = '\0';
-+ context->stdoutb[0] = '\0';
- context->stdout_size = 0;
-
- context->stderr_fd = err_fd[0];
- fcntl (context->stderr_fd, F_SETFL, O_NONBLOCK);
- close (err_fd[1]);
-- context->stderr[0] = '\0';
-+ context->stderrb[0] = '\0';
- context->stderr_size = 0;
-
- context->stdin_fd = in_fd[1];
-@@ -1193,7 +1194,7 @@ process_output (ChildContext * context)
-
- if (size > 0 && size < GTK_MPLAYER_BUF_SIZE)
- {
-- memcpy (buf, context->stderr, size);
-+ memcpy (buf, context->stderrb, size);
- next = buf + size;
- }
- else
-@@ -1211,7 +1212,7 @@ process_output (ChildContext * context)
- size += MIN (GTK_MPLAYER_BUF_SIZE - 1, n);
-
- process_lines (context, buf, size,
-- context->stderr, &context->stderr_size, TRUE);
-+ context->stderrb, &context->stderr_size, TRUE);
- }
-
- /*
-@@ -1221,7 +1222,7 @@ process_output (ChildContext * context)
-
- if (size > 0 && size < GTK_MPLAYER_BUF_SIZE)
- {
-- memcpy (buf, context->stdout, size);
-+ memcpy (buf, context->stdoutb, size);
- next = buf + size;
- }
- else
-@@ -1240,7 +1241,7 @@ process_output (ChildContext * context)
- pos = context->player->pos;
-
- process_lines (context, buf, size,
-- context->stdout, &context->stdout_size, FALSE);
-+ context->stdoutb, &context->stdout_size, FALSE);
-
- if (fabs (context->player->pos - pos) > 0.1)
- gtk_signal_emit (GTK_OBJECT (context->player),
diff --git a/graphics/pornview/patches/patch-ae b/graphics/pornview/patches/patch-ae
deleted file mode 100644
index 38a8cb43797..00000000000
--- a/graphics/pornview/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/02/11 13:06:43 rillig Exp $
-
---- src/support/widgets/gtkxine.h.orig 2002-12-29 20:29:13.000000000 +0000
-+++ src/support/widgets/gtkxine.h
-@@ -20,6 +20,7 @@
-
- #ifdef ENABLE_XINE
-
-+#include <pthread.h>
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/extensions/XShm.h>
diff --git a/graphics/pornview/patches/patch-af b/graphics/pornview/patches/patch-af
deleted file mode 100644
index 7a0d8d1a078..00000000000
--- a/graphics/pornview/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/02/14 18:33:06 joerg Exp $
-
---- src/support/widgets/gtkcellrendererpixmap.c.orig 2009-02-14 19:18:45.000000000 +0100
-+++ src/support/widgets/gtkcellrendererpixmap.c
-@@ -12,10 +12,6 @@
- * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
- */
-
--#ifndef GTK_DISABLE_DEPRECATED
--#define GTK_DISABLE_DEPRECATED
--#endif /* GTK_DISABLE_DEPRECATED */
--
- #include "gtkcellrendererpixmap.h"
-
- #if (GTK_MAJOR_VERSION >= 2)
diff --git a/graphics/ppmtoxvpic/DESCR b/graphics/ppmtoxvpic/DESCR
deleted file mode 100644
index d16c7b97217..00000000000
--- a/graphics/ppmtoxvpic/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Utilities to create files that can be used as preview files
-for xv and gimp, usually stored in .xvpics directory.
-
-These utilities are part of the "dfm" package, but not
-installed by default.
diff --git a/graphics/ppmtoxvpic/Makefile b/graphics/ppmtoxvpic/Makefile
deleted file mode 100644
index a5c476cdc8c..00000000000
--- a/graphics/ppmtoxvpic/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2010/01/24 13:26:11 wiz Exp $
-#
-
-PKGNAME= ppmtoxvpic-0.99.9
-PKGREVISION= 8
-CATEGORIES= graphics
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Convert PPM image to preview pic readable by xv and gimp
-
-PKG_DESTDIR_SUPPORT= user-destdir
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/utils/xvpicmaker ${DESTDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/utils/ppmtoxvpic ${DESTDIR}${PREFIX}/bin
-
-.include "../../x11/dfm/Makefile.common"
diff --git a/graphics/ppmtoxvpic/PLIST b/graphics/ppmtoxvpic/PLIST
deleted file mode 100644
index 1b8d7df55da..00000000000
--- a/graphics/ppmtoxvpic/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:26 zuntum Exp $
-bin/ppmtoxvpic
-bin/xvpicmaker
diff --git a/graphics/ppmtoxvpic/distinfo b/graphics/ppmtoxvpic/distinfo
deleted file mode 100644
index 7af2828850b..00000000000
--- a/graphics/ppmtoxvpic/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 08:45:12 agc Exp $
-
-SHA1 (dfm-0.99.9.tar.gz) = 491f7ed1f8f82a0272143fa79b1b7ca705d34664
-RMD160 (dfm-0.99.9.tar.gz) = ab7a4b36e594d9d347e5a1e3d9c06abc2a287693
-Size (dfm-0.99.9.tar.gz) = 389444 bytes
-SHA1 (patch-aa) = 2ffe8bad9f6d21f323b472a18636a1e3d5815413
diff --git a/graphics/ppmtoxvpic/patches/patch-aa b/graphics/ppmtoxvpic/patches/patch-aa
deleted file mode 100644
index 051a34e7b88..00000000000
--- a/graphics/ppmtoxvpic/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/05 01:51:08 hubertf Exp $
-
---- Makefile.in.orig Tue May 1 22:58:09 2001
-+++ Makefile.in
-@@ -93,7 +93,7 @@
- VERSION = @VERSION@
- l = @l@
-
--SUBDIRS = intl src po share utils dfmext-install
-+SUBDIRS = utils
-
- man_MANS = dfm.1x
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/graphics/qcamview/DESCR b/graphics/qcamview/DESCR
deleted file mode 100644
index e214a088f9e..00000000000
--- a/graphics/qcamview/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Logitech Quickcam Express USB Utilities for NetBSD
-
-qcamshot ... simple image capture program ( output stdout PPM file )
-qcamview ... sequential image capture program like animation( about 3fps )
-
-Programs are required Linux device driver source, but they are not device
-driver, they are user application programs that use ugen(4).
diff --git a/graphics/qcamview/Makefile b/graphics/qcamview/Makefile
deleted file mode 100644
index dbb9a9dab1f..00000000000
--- a/graphics/qcamview/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2011/02/19 09:02:07 markd Exp $
-#
-
-DISTNAME= qce-ga-0.40d
-PKGNAME= qcamview-0.4
-PKGREVISION= 8
-CATEGORIES= graphics x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qce-ga/}
-
-PATCH_SITES= http://www.medias.ne.jp/~takam/bsd/
-PATCHFILES= qce-ga-bsd-0.04.patch.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= hamajima@NetBSD.org
-HOMEPAGE= http://www.medias.ne.jp/~takam/bsd/NetBSD.html#qcam
-COMMENT= Logitech Quickcam Express USB Utilities
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
-
-MAKE_ENV+= ${BSD_MAKE_ENV}
-
-do-build:
- for f in qcamshot qcamview ; do \
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- NOGCCERROR= \
- ${MAKE_PROGRAM} -f ${MAKE_FILE}.$$f ; \
- done
-
-do-install:
- for f in qcamshot qcamview ; do \
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} -f ${MAKE_FILE}.$$f install ${INSTALL_MAKE_FLAGS} ; \
- done
-
-.include "../../graphics/imlib-gtk/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/qcamview/PLIST b/graphics/qcamview/PLIST
deleted file mode 100644
index eec5fcef43e..00000000000
--- a/graphics/qcamview/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/11 14:04:06 hamajima Exp $
-bin/qcamshot
-bin/qcamview
-man/cat1/qcamshot.0
-man/cat1/qcamview.0
-man/man1/qcamshot.1
-man/man1/qcamview.1
diff --git a/graphics/qcamview/distinfo b/graphics/qcamview/distinfo
deleted file mode 100644
index 015c4c82afc..00000000000
--- a/graphics/qcamview/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/04/22 18:19:02 joerg Exp $
-
-SHA1 (qce-ga-0.40d.tar.gz) = 508b74d3d839b4a837a5fa1fbb0f48678e9b0bad
-RMD160 (qce-ga-0.40d.tar.gz) = 4c1cd898e75e30a654b9a8979d4c61f915f8bb23
-Size (qce-ga-0.40d.tar.gz) = 40715 bytes
-SHA1 (qce-ga-bsd-0.04.patch.gz) = 3984481734d308545f12451748b3e45ff03b11a0
-RMD160 (qce-ga-bsd-0.04.patch.gz) = 3febc74b1f8034aca58d8bcd40522b294394878d
-Size (qce-ga-bsd-0.04.patch.gz) = 17623 bytes
-SHA1 (patch-aa) = 9b717ed225e9f6d2334ba2122a4ff764e789f074
-SHA1 (patch-ab) = a3c4375c46dba115de2d2c783c000daa0aeb0e01
-SHA1 (patch-ac) = 8cdbda378cd239699a4d2037c289e9059d7aa40f
-SHA1 (patch-ad) = b559dfeff6b5c4b3121b99cb15d6767d43052a03
-SHA1 (patch-ae) = 36d6d465c610ba378bf41ced765f4a729b8e7c45
-SHA1 (patch-af) = fd114044703590828a1959e8bdfb18cf667c5d62
diff --git a/graphics/qcamview/patches/patch-aa b/graphics/qcamview/patches/patch-aa
deleted file mode 100644
index 9181ed6abb4..00000000000
--- a/graphics/qcamview/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/03/07 08:23:14 hamajima Exp $
-
---- Makefile.qcamview.orig 2004-03-07 09:12:44.000000000 +0900
-+++ Makefile.qcamview 2004-03-07 09:13:19.000000000 +0900
-@@ -8,11 +8,11 @@
- SRCS = qcamview.c linux_usbif.c quickcam.c pb0100.c hdcs.c vv6410.c gui.c
- MAN = ${PROG}.1
-
--GTKCFLAGS != gtk12-config --cflags
-+GTKCFLAGS != gtk-config --cflags
- IMLIBCFLAGS != imlib-config --cflags-gdk
- CFLAGS += -Wall ${GTKCFLAGS} ${IMLIBCFLAGS}
-
--GTKLDFLAGS != gtk12-config --libs
-+GTKLDFLAGS != gtk-config --libs
- IMLIBLDFLAGS!= imlib-config --libs-gdk
- LDFLAGS += -Wall ${GTKLDFLAGS} ${IMLIBLDFLAGS}
-
diff --git a/graphics/qcamview/patches/patch-ab b/graphics/qcamview/patches/patch-ab
deleted file mode 100644
index 7128bf18abe..00000000000
--- a/graphics/qcamview/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/04/22 18:19:02 joerg Exp $
-
---- quickcam.c.orig 2006-04-22 18:15:24.000000000 +0000
-+++ quickcam.c
-@@ -64,7 +64,11 @@
- #include <ctype.h>
- #include <sys/ioctl.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include "quickcam.h"
- #include "pb0100.h"
diff --git a/graphics/qcamview/patches/patch-ac b/graphics/qcamview/patches/patch-ac
deleted file mode 100644
index 688f038d51f..00000000000
--- a/graphics/qcamview/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/22 18:19:02 joerg Exp $
-
---- qcamview.c.orig 2006-04-22 18:15:43.000000000 +0000
-+++ qcamview.c
-@@ -16,7 +16,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include <gtk/gtk.h>
- #include <gdk_imlib.h>
diff --git a/graphics/qcamview/patches/patch-ad b/graphics/qcamview/patches/patch-ad
deleted file mode 100644
index 9ff96280cd4..00000000000
--- a/graphics/qcamview/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/04/22 18:19:02 joerg Exp $
-
---- qcamshot.c.orig 2006-04-22 18:15:53.000000000 +0000
-+++ qcamshot.c
-@@ -31,7 +31,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include "linux_usbif.h"
- #include "quickcam.h" /* Control register of the STV0600 ASIC */
diff --git a/graphics/qcamview/patches/patch-ae b/graphics/qcamview/patches/patch-ae
deleted file mode 100644
index 2c4596ed4e9..00000000000
--- a/graphics/qcamview/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/04/22 18:19:02 joerg Exp $
-
---- linux_usbif.h.orig 2006-04-22 18:16:05.000000000 +0000
-+++ linux_usbif.h
-@@ -11,7 +11,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #define USB_DIR_OUT UT_WRITE
- #define USB_DIR_IN UT_READ
diff --git a/graphics/qcamview/patches/patch-af b/graphics/qcamview/patches/patch-af
deleted file mode 100644
index ffbb2aa1a54..00000000000
--- a/graphics/qcamview/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/04/22 18:19:02 joerg Exp $
-
---- linux_usbif.c.orig 2006-04-22 18:16:18.000000000 +0000
-+++ linux_usbif.c
-@@ -28,7 +28,11 @@
-
- #include <ctype.h>
- #include <sys/ioctl.h>
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include "linux_usbif.h"
-
diff --git a/graphics/snx101view/DESCR b/graphics/snx101view/DESCR
deleted file mode 100644
index b6929c36d0a..00000000000
--- a/graphics/snx101view/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-USB Webcam based sonix SN9C101 chip Utility Programs
-
-snx101shot ... simple image capture program ( output stdout PPM file )
-snx101view ... sequential image viewer program
diff --git a/graphics/snx101view/Makefile b/graphics/snx101view/Makefile
deleted file mode 100644
index 00e4bf13d70..00000000000
--- a/graphics/snx101view/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2011/02/19 09:02:07 markd Exp $
-#
-
-DISTNAME= snx101util-0.2
-PKGREVISION= 8
-CATEGORIES= graphics x11
-MASTER_SITES= http://www.medias.ne.jp/~takam/bsd/
-
-MAINTAINER= hamajima@NetBSD.org
-HOMEPAGE= http://www.medias.ne.jp/~takam/bsd/NetBSD.html#sonix
-COMMENT= USB Webcam based sonix SN9C101 chip Utility Programs
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-MAKE_ENV+= NOGCCERROR=
-MAKE_ENV+= ${BSD_MAKE_ENV}
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
-
-.include "../../graphics/imlib-gtk/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/snx101view/PLIST b/graphics/snx101view/PLIST
deleted file mode 100644
index dac92e69e3b..00000000000
--- a/graphics/snx101view/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/05 07:36:58 hamajima Exp $
-bin/snx101shot
-bin/snx101view
-man/cat1/snx101shot.0
-man/cat1/snx101view.0
-man/man1/snx101shot.1
-man/man1/snx101view.1
diff --git a/graphics/snx101view/distinfo b/graphics/snx101view/distinfo
deleted file mode 100644
index fcb25846c4f..00000000000
--- a/graphics/snx101view/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/04/22 18:32:00 joerg Exp $
-
-SHA1 (snx101util-0.2.tar.gz) = 118b6b8ae8427d43ea275e14eaad116915e74bd8
-RMD160 (snx101util-0.2.tar.gz) = f25f99cb1001f56a20c36f5e1747f7ad036d5a10
-Size (snx101util-0.2.tar.gz) = 9983 bytes
-SHA1 (patch-aa) = e23574abe40ba5308663a2a98ec57d16210e5f52
-SHA1 (patch-ab) = 722d9f5a336e84a26ce0e7ee3567bc9430f32d8e
-SHA1 (patch-ac) = a34f1eceffbd309983867be0e850a43788e3a551
-SHA1 (patch-ad) = 8459c283f077ff56c5a1480375b84424acc341d5
diff --git a/graphics/snx101view/patches/patch-aa b/graphics/snx101view/patches/patch-aa
deleted file mode 100644
index d7f95ebf14f..00000000000
--- a/graphics/snx101view/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/22 18:32:00 joerg Exp $
-
---- sonix.h.orig 2006-04-22 18:25:20.000000000 +0000
-+++ sonix.h
-@@ -7,7 +7,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #define ISOBUF_SIZE 1023
- #define WIDTH 320
diff --git a/graphics/snx101view/patches/patch-ab b/graphics/snx101view/patches/patch-ab
deleted file mode 100644
index 0030be8615a..00000000000
--- a/graphics/snx101view/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/04/22 18:32:00 joerg Exp $
-
---- sonix.c.orig 2006-04-22 18:25:30.000000000 +0000
-+++ sonix.c
-@@ -40,7 +40,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include "sonix.h"
- #include "sonixinit.h"
diff --git a/graphics/snx101view/patches/patch-ac b/graphics/snx101view/patches/patch-ac
deleted file mode 100644
index efc3f2b1221..00000000000
--- a/graphics/snx101view/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/22 18:32:00 joerg Exp $
-
---- snx101view.c.orig 2006-04-22 18:25:52.000000000 +0000
-+++ snx101view.c
-@@ -47,7 +47,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include <gtk/gtk.h>
- #include <gdk_imlib.h>
diff --git a/graphics/snx101view/patches/patch-ad b/graphics/snx101view/patches/patch-ad
deleted file mode 100644
index 759eaa995c0..00000000000
--- a/graphics/snx101view/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/04/22 18:32:00 joerg Exp $
-
---- snx101shot.c.orig 2006-04-22 18:26:04.000000000 +0000
-+++ snx101shot.c
-@@ -40,7 +40,11 @@
- #include <string.h>
- #include <err.h>
-
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-
- #include "sonix.h"
-