Update RMagick to 2.0.0.

RMagick 2 is the future of RMagick. This is the version that will get new
methods and support new ImageMagick features.

RMagick 2 does not support GraphicsMagick.

Changes:
RMagick 2.0.0
    o Replaced configure/make/make install with standard Ruby setup.rb,
      extconf.rb
    o Removed support for Ruby earlier than 1.8.2
    o Removed support for GraphicsMagick. As a result these methods are no
      longer available: Image#grayscale_pseudo_class, Image#statistics.
    o Removed support for all releases of ImageMagick earlier than 6.3.0.
    o Removed deprecated Image#random_channel_threshold. Use
      Image#random_threshold_channel instead
    o Removed deprecated Image#channel_threshold. Use
      Image#random_threshold_channel instead
    o Removed unecessary Image#montage=
    o Removed unecessary and undocumented Image#image_type=
    o Removed deprecated Image::Info#tile_info, tile_info= attributes.
    o Removed deprecated Image::Info#tile, tile= attributes. Use #extract,
      #extract= instead
    o Removed deprecated Image::Info#subimage, subimage= attributes. Use
      scene, scene= instead
    o Removed deprecated Image::Info#subrange, subrange= attributes. Use
      number_scenes, number_scenes= instead
    o Removed deprecated Magick.set_monitor. Use Image#set_monitor,
      Image::Info#set_monitor instead
    o Removed deprecated RunlengthEncodedCompression CompressionType. Use
      RLECompression instead
    o Deprecated Image#matte, matte= with ImageMagick 6.3.5 and later
    o Added Image::Info#stroke=, stroke_width= and undercolor= attributes
    o Added Image::Info#tile_offset= attribute
    o Added Draw#fill_pattern= and #stroke_pattern= annotate attributes
    o Changed Image::Info[] and Image::Info[]= to allow an omitted \"format\"
      argument
    o Added Image#destroy!, destroyed?, check_destroyed methods
    o Support Image object creation/destruction tracing with the
      Magick.trace_proc attribute
    o Added Magick::QuantumRange. Magick::MaxRGB is deprecated.
    o Added OptimizeTransLayer, RemoveDupsLayer, RemoveZeroLayer,
      OptimizeImageLayer ImageLayerMethods enum values (available with
      ImageMagick 6.3.3),
      MosaicLayer, FlattenLayer (available with ImageMagick 6.3.6)
    o RMagick works with Q32 version of ImageMagick
    o Added ChangeMaskCompositeOp, DivideCompositeOp, LinearLightCompositeOp
      CompositeOperator enum values
    o Added SplineInterpolatePixel InterpolatePixelMethod enum value
    o Added DitherVirtualPixelMethod, RandomVirtualPixelMethod,
      BlackVirtualPixelMethod, GrayVirtualPixelMethod, WhiteVirtualPixelMethod
      (available with ImageMagick 6.3.5), and MaskVirtualPixelMethod (available
      with ImageMagick 6.3.3) VirtualPixelMethod enum values
    o Added GIFInterlace, JPEGInterlace, PNGInterlace Interlace type enum
      values (available with ImageMagick 6.3.4)
    o Added SentinelFilter FilterTypes enum value (available in ImageMagick
      6.3.6)
    o Added Image.combine
    o Added Image#separate (available with ImageMagick 6.3.2)
    o Added Image#distort (available with ImageMagick 6.3.5)
    o Added Image#each_pixel (thanks to Russell Norris for the suggestion and
      code)
    o Added Image#histogram? (available with ImageMagick 6.3.5)
    o Added Image#sync_profiles  (available with ImageMagick 6.3.2)
    o Added Image#extent (available with ImageMagick 6.3.1)
    o Added Image#excerpt, Image#excerpt! (available with ImageMagick 6.3.5)
    o Added Image::Info#attenuate
    o Added Image#clut_channel (available with ImageMagick 6.3.5)
    o Feature Request #16264, added ImageList#composite_layers (available with
      ImageMagick 6.3.3, request from Steve Martocci)
    o Added Image#alpha= (available with ImageMagick 6.3.5)
    o Added Image#gravity=
    o Added Image#equalize_channel (available with ImageMagick 6.3.6)
    o Added new FilterTypes values KaiserFilter, WelshFilter, ParzenFilter,
      LagrangeFilter, BohmanFilter, BartlettFilter (available with ImageMagick
      6.3.6)
    o Fix bug #10339, Image#trim does not support \"reset page information
      option\" (bug report from Nobody)
    o Renamed RMagick.so to RMagick2.so to prevent confusion between RMagick.rb
      and RMagick.so
    o Feature Request #16276, re-organize doc to not split Image method pages
      in the middle of an initial letter (request from Roy Leban)
    o Updated for ImageMagick 6.3.7-5
    o Made changes as necessary to work with current Ruby 1.9.0

5 files changed, 23 insertions, 32 deletions

diff --git a/graphics/ruby-RMagick/DESCR b/graphics/ruby-RMagick/DESCR
index 113570a5a83..29aa106df40 100644
--- a/graphics/ruby-RMagick/DESCR
+++ b/graphics/ruby-RMagick/DESCR
@@ -1,2 +1 @@
-RMagick is an interface between the Ruby programming language and the
-ImageMagick and GraphicsMagick image processing libraries.
+RMagick is an interface between Ruby and ImageMagick.
diff --git a/graphics/ruby-RMagick/Makefile b/graphics/ruby-RMagick/Makefile
index fff65977bf7..75aa8be686c 100644
--- a/graphics/ruby-RMagick/Makefile
+++ b/graphics/ruby-RMagick/Makefile
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.42 2007/12/31 00:08:22 obache Exp $
+# $NetBSD: Makefile,v 1.43 2008/01/04 03:05:13 obache Exp $
 
-DISTNAME=	RMagick-1.15.12
+DISTNAME=	RMagick-2.0.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/29787/ \
+MASTER_SITES=	http://rubyforge.org/frs/download.php/29810/ \
 		http://raa.ruby-lang.org/cache/rmagick/
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://rmagick.rubyforge.org/
-COMMENT=	Ruby GraphicsMagick or ImageMagick extension
-
-.include "options.mk"
+COMMENT=	Ruby binding to ImageMagick
 
 RUBY_HAS_ARCHLIB=	yes
-GNU_CONFIGURE=		yes
+USE_RUBY_SETUP=		yes
 
-CONFIGURE_ARGS+=	--with-doc-dir=${RUBY_DOCDIR}/RMagick
+CONFIGURE_ARGS+=	--doc-dir=${RUBY_DOCDIR}/RMagick
 USE_TOOLS+=	gs
 
 post-install:
@@ -23,5 +21,6 @@ post-install:
 	cd ${WRKSRC}/examples && \
 		${PAX} -rw -pp -pm . ${RUBY_EXAMPLESDIR}/RMagick
 
+.include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-RMagick/PLIST b/graphics/ruby-RMagick/PLIST
index 58b55e67edc..308e2b6c5b0 100644
--- a/graphics/ruby-RMagick/PLIST
+++ b/graphics/ruby-RMagick/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.10 2007/01/22 01:40:44 obache Exp $
-${RUBY_SITEARCHLIBDIR}/RMagick.${RUBY_DLEXT}
+@comment $NetBSD: PLIST,v 1.11 2008/01/04 03:05:13 obache Exp $
+${RUBY_SITEARCHLIBDIR}/RMagick2.${RUBY_DLEXT}
 ${RUBY_SITELIBDIR}/RMagick.rb
 ${RUBY_SITELIBDIR}/rvg/clippath.rb
 ${RUBY_SITELIBDIR}/rvg/container.rb
@@ -15,6 +15,7 @@ ${RUBY_SITELIBDIR}/rvg/stylable.rb
 ${RUBY_SITELIBDIR}/rvg/text.rb
 ${RUBY_SITELIBDIR}/rvg/transformable.rb
 ${RUBY_SITELIBDIR}/rvg/units.rb
+${RUBY_EXAMPLESDIR}/RMagick/crop_with_gravity.rb
 ${RUBY_EXAMPLESDIR}/RMagick/demo.rb
 ${RUBY_EXAMPLESDIR}/RMagick/describe.rb
 ${RUBY_EXAMPLESDIR}/RMagick/find_similar_region.rb
@@ -28,6 +29,7 @@ ${RUBY_EXAMPLESDIR}/RMagick/spinner.rb
 ${RUBY_EXAMPLESDIR}/RMagick/thumbnail.rb
 ${RUBY_EXAMPLESDIR}/RMagick/vignette.rb
 ${RUBY_DOCDIR}/RMagick/.rmagick
+${RUBY_DOCDIR}/RMagick/composite_layers.rb.html
 ${RUBY_DOCDIR}/RMagick/crop_resized.rb.html
 ${RUBY_DOCDIR}/RMagick/css/.rmagick
 ${RUBY_DOCDIR}/RMagick/css/doc.css
@@ -139,6 +141,9 @@ ${RUBY_DOCDIR}/RMagick/ex/colors.miff
 ${RUBY_DOCDIR}/RMagick/ex/colors.rb
 ${RUBY_DOCDIR}/RMagick/ex/composite.gif
 ${RUBY_DOCDIR}/RMagick/ex/composite.rb
+${RUBY_DOCDIR}/RMagick/ex/composite_layers.gif
+${RUBY_DOCDIR}/RMagick/ex/composite_layers.rb
+${RUBY_DOCDIR}/RMagick/ex/composite_layers1.gif
 ${RUBY_DOCDIR}/RMagick/ex/constitute.jpg
 ${RUBY_DOCDIR}/RMagick/ex/contrast.jpg
 ${RUBY_DOCDIR}/RMagick/ex/contrast.rb
@@ -176,6 +181,8 @@ ${RUBY_DOCDIR}/RMagick/ex/equalize.jpg
 ${RUBY_DOCDIR}/RMagick/ex/equalize.rb
 ${RUBY_DOCDIR}/RMagick/ex/evenodd.gif
 ${RUBY_DOCDIR}/RMagick/ex/evenodd.rb
+${RUBY_DOCDIR}/RMagick/ex/fill_pattern.gif
+${RUBY_DOCDIR}/RMagick/ex/fill_pattern.rb
 ${RUBY_DOCDIR}/RMagick/ex/flatten_images.gif
 ${RUBY_DOCDIR}/RMagick/ex/flatten_images.rb
 ${RUBY_DOCDIR}/RMagick/ex/flip.jpg
@@ -551,6 +558,7 @@ ${RUBY_DOCDIR}/RMagick/color_reset.rb.html
 ${RUBY_DOCDIR}/RMagick/colorize.rb.html
 ${RUBY_DOCDIR}/RMagick/colors.rb.html
 ${RUBY_DOCDIR}/RMagick/composite.rb.html
+${RUBY_DOCDIR}/RMagick/composite_layers.rb.html
 ${RUBY_DOCDIR}/RMagick/comtasks.html
 ${RUBY_DOCDIR}/RMagick/constants.html
 ${RUBY_DOCDIR}/RMagick/contrast.rb.html
@@ -570,6 +578,7 @@ ${RUBY_DOCDIR}/RMagick/emboss.rb.html
 ${RUBY_DOCDIR}/RMagick/enhance.rb.html
 ${RUBY_DOCDIR}/RMagick/equalize.rb.html
 ${RUBY_DOCDIR}/RMagick/evenodd.rb.html
+${RUBY_DOCDIR}/RMagick/fill_pattern.rb.html
 ${RUBY_DOCDIR}/RMagick/flatten_images.rb.html
 ${RUBY_DOCDIR}/RMagick/flip.rb.html
 ${RUBY_DOCDIR}/RMagick/flop.rb.html
diff --git a/graphics/ruby-RMagick/distinfo b/graphics/ruby-RMagick/distinfo
index b7a7f232dc7..33e370a29e5 100644
--- a/graphics/ruby-RMagick/distinfo
+++ b/graphics/ruby-RMagick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.29 2007/12/31 00:08:22 obache Exp $
+$NetBSD: distinfo,v 1.30 2008/01/04 03:05:13 obache Exp $
 
-SHA1 (RMagick-1.15.12.tar.gz) = 1edef746cbb90c6675dbb2c5cbbb632bdc4fd578
-RMD160 (RMagick-1.15.12.tar.gz) = 33fd5c8a4637f3aa24c6d52eaad8d43081d1d097
-Size (RMagick-1.15.12.tar.gz) = 1070021 bytes
+SHA1 (RMagick-2.0.0.tar.gz) = dab431ee65c88d60a6c61d88d237be4d03d0c27d
+RMD160 (RMagick-2.0.0.tar.gz) = 5f585615b96d03d0b50dfe98a4f8038b1b0f45dc
+Size (RMagick-2.0.0.tar.gz) = 1024966 bytes
diff --git a/graphics/ruby-RMagick/options.mk b/graphics/ruby-RMagick/options.mk
deleted file mode 100644
index 7e0a3cd553f..00000000000
--- a/graphics/ruby-RMagick/options.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2006/10/28 02:04:31 obache Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.rmagick
-PKG_OPTIONS_REQUIRED_GROUPS=	backend
-PKG_OPTIONS_GROUP.backend=	graphicsmagick imagemagick
-PKG_SUGGESTED_OPTIONS=		graphicsmagick
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgraphicsmagick)
-.  include "../../graphics/GraphicsMagick/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-graphics-magick
-.elif !empty(PKG_OPTIONS:Mimagemagick)
-.  include "../../graphics/ImageMagick/buildlink3.mk"
-CONFIGURE_ARGS+=	--without-graphics-magick
-.endif