Subject: pkg/30171: Update graphics/ruby-RMagick from 1.7.4 to 1.8.0
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <obata@lins.jp>
List: pkgsrc-bugs
Date: 05/08/2005 04:06:00
>Number:         30171
>Category:       pkg
>Synopsis:       Update graphics/ruby-RMagick from 1.7.4 to 1.8.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun May 08 04:06:00 +0000 2005
>Originator:     OBATA Akio
>Release:        NetBSD 2.0.2_STABLE
>Organization:
	LINS, Japan.
>Environment:
System: NetBSD miki.lins.jp 2.0.2_STABLE NetBSD 2.0.2_STABLE (MIKI) #3: Sat Apr 16 22:07:03 JST 2005 obata@miki.lins.jp:/usr/src/sys/arch/i386/compile/MIKI i386
Architecture: i386
Machine: i386
>Description:
	Change Log.
		RMagick 1.8.0 - April 30, 2005 
		o Added Image#shadow (ImageMagick 6.1.7) 
		o Added Image::Info#undefine, #[], #[]= 
		o Added sigmoidal_contrast_channel, sepiatone to Image class
		  (ImageMagick 6.2.1) 
		o Added JPEG2000Compression constant (ImageMagick 6.2.2) 
		o Incorporated RVG classes 
		o Added RVG documentation, examples, updated installer 
		o Tested with ImageMagick 6.2.2-0, latest GraphicsMagick 1.2 

	pkgsrc changes.
		- change patches for 'fmax' to a way of doing in CVS HEAD.

>How-To-Repeat:
	N/A
>Fix:
	Heare is a patch for update.

Index: graphics/ruby-RMagick/Makefile
===================================================================
RCS file: /home/cvsroot/NetBSD/pkgsrc/graphics/ruby-RMagick/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- graphics/ruby-RMagick/Makefile	25 Apr 2005 14:42:25 -0000	1.2
+++ graphics/ruby-RMagick/Makefile	8 May 2005 01:21:40 -0000
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.2 2005/04/25 14:42:25 minskim Exp $
 
-DISTNAME=	RMagick-1.7.4
+DISTNAME=	RMagick-1.8.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/3788/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/4265/
 
 MAINTAINER=	obata@lins.jp
 HOMEPAGE=	http://rmagick.rubyforge.org/
@@ -17,11 +17,6 @@
 CONFIGURE_ARGS+=	--with-doc-dir=${RUBY_DOCDIR}/RMagick
 CONFIGURE_ARGS+=	--without-graphics-magick
 
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-2*)
-BUILDLINK_TRANSFORM+=	rm:-std=gnu99
-.endif
-
 post-install:
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/RMagick
 	cd ${WRKSRC}/examples && \
Index: graphics/ruby-RMagick/PLIST
===================================================================
RCS file: /home/cvsroot/NetBSD/pkgsrc/graphics/ruby-RMagick/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- graphics/ruby-RMagick/PLIST	6 Apr 2005 14:54:02 -0000	1.1.1.1
+++ graphics/ruby-RMagick/PLIST	8 May 2005 02:25:09 -0000
@@ -1,5 +1,19 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2005/04/06 14:54:02 minskim Exp $
 ${RUBY_SITEARCHLIBDIR}/RMagick.${RUBY_DLEXT}
+${RUBY_SITELIBDIR}/rvg/clippath.rb
+${RUBY_SITELIBDIR}/rvg/container.rb
+${RUBY_SITELIBDIR}/rvg/deep_equal.rb
+${RUBY_SITELIBDIR}/rvg/describable.rb
+${RUBY_SITELIBDIR}/rvg/embellishable.rb
+${RUBY_SITELIBDIR}/rvg/misc.rb
+${RUBY_SITELIBDIR}/rvg/paint.rb
+${RUBY_SITELIBDIR}/rvg/pathdata.rb
+${RUBY_SITELIBDIR}/rvg/rvg.rb
+${RUBY_SITELIBDIR}/rvg/stretchable.rb
+${RUBY_SITELIBDIR}/rvg/stylable.rb
+${RUBY_SITELIBDIR}/rvg/text.rb
+${RUBY_SITELIBDIR}/rvg/transformable.rb
+${RUBY_SITELIBDIR}/rvg/units.rb
 ${RUBY_SITELIBDIR}/RMagick.rb
 ${RUBY_EXAMPLESDIR}/RMagick/describe.rb
 ${RUBY_EXAMPLESDIR}/RMagick/histogram.rb
@@ -13,6 +27,7 @@
 ${RUBY_DOCDIR}/RMagick/css/.rmagick
 ${RUBY_DOCDIR}/RMagick/css/doc.css
 ${RUBY_DOCDIR}/RMagick/css/popup.css
+${RUBY_DOCDIR}/RMagick/css/ref.css
 @dirrm ${RUBY_DOCDIR}/RMagick/css
 ${RUBY_DOCDIR}/RMagick/ex/images/.rmagick
 ${RUBY_DOCDIR}/RMagick/ex/images/Ballerina.jpg
@@ -65,6 +80,24 @@
 ${RUBY_DOCDIR}/RMagick/ex/images/Shorts.jpg
 ${RUBY_DOCDIR}/RMagick/ex/images/Snake.wmf
 ${RUBY_DOCDIR}/RMagick/ex/images/Violin.jpg
+${RUBY_DOCDIR}/RMagick/ex/images/big-duck.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck0.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck1.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck10.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck11.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck12.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck13.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck14.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck15.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck2.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck3.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck4.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck5.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck6.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck7.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck8.gif
+${RUBY_DOCDIR}/RMagick/ex/images/duck9.gif
 ${RUBY_DOCDIR}/RMagick/ex/images/graydient230x6.gif
 ${RUBY_DOCDIR}/RMagick/ex/images/logo400x83.gif
 ${RUBY_DOCDIR}/RMagick/ex/images/model.miff
@@ -75,6 +108,27 @@
 ${RUBY_DOCDIR}/RMagick/ex/.examples
 ${RUBY_DOCDIR}/RMagick/ex/.rmagick
 ${RUBY_DOCDIR}/RMagick/ex/Adispatch.rb
+${RUBY_DOCDIR}/RMagick/ex/InitialCoords.gif
+${RUBY_DOCDIR}/RMagick/ex/InitialCoords.rb
+${RUBY_DOCDIR}/RMagick/ex/NewCoordSys.gif
+${RUBY_DOCDIR}/RMagick/ex/NewCoordSys.rb
+${RUBY_DOCDIR}/RMagick/ex/OrigCoordSys.gif
+${RUBY_DOCDIR}/RMagick/ex/OrigCoordSys.rb
+${RUBY_DOCDIR}/RMagick/ex/PreserveAspectRatio.gif
+${RUBY_DOCDIR}/RMagick/ex/PreserveAspectRatio.rb
+${RUBY_DOCDIR}/RMagick/ex/RotateScale.gif
+${RUBY_DOCDIR}/RMagick/ex/RotateScale.rb
+${RUBY_DOCDIR}/RMagick/ex/Skew.gif
+${RUBY_DOCDIR}/RMagick/ex/Skew.rb
+${RUBY_DOCDIR}/RMagick/ex/Use01.gif
+${RUBY_DOCDIR}/RMagick/ex/Use01.rb
+${RUBY_DOCDIR}/RMagick/ex/Use02.gif
+${RUBY_DOCDIR}/RMagick/ex/Use02.rb
+${RUBY_DOCDIR}/RMagick/ex/Use03.gif
+${RUBY_DOCDIR}/RMagick/ex/Use03.rb
+${RUBY_DOCDIR}/RMagick/ex/ViewBox.rb
+${RUBY_DOCDIR}/RMagick/ex/ViewBox_150x200.gif
+${RUBY_DOCDIR}/RMagick/ex/ViewBox_300x200.gif
 ${RUBY_DOCDIR}/RMagick/ex/Zconstitute.rb
 ${RUBY_DOCDIR}/RMagick/ex/adaptive_threshold.jpg
 ${RUBY_DOCDIR}/RMagick/ex/adaptive_threshold.rb
@@ -93,11 +147,17 @@
 ${RUBY_DOCDIR}/RMagick/ex/arc.rb
 ${RUBY_DOCDIR}/RMagick/ex/arcpath.gif
 ${RUBY_DOCDIR}/RMagick/ex/arcpath.rb
+${RUBY_DOCDIR}/RMagick/ex/arcs01.gif
+${RUBY_DOCDIR}/RMagick/ex/arcs01.rb
+${RUBY_DOCDIR}/RMagick/ex/arcs02.gif
+${RUBY_DOCDIR}/RMagick/ex/arcs02.rb
 ${RUBY_DOCDIR}/RMagick/ex/average.rb
 ${RUBY_DOCDIR}/RMagick/ex/average_after.gif
 ${RUBY_DOCDIR}/RMagick/ex/average_before.gif
 ${RUBY_DOCDIR}/RMagick/ex/axes.gif
 ${RUBY_DOCDIR}/RMagick/ex/axes.rb
+${RUBY_DOCDIR}/RMagick/ex/baseline_shift01.gif
+${RUBY_DOCDIR}/RMagick/ex/baseline_shift01.rb
 ${RUBY_DOCDIR}/RMagick/ex/bilevel_channel.jpg
 ${RUBY_DOCDIR}/RMagick/ex/bilevel_channel.rb
 ${RUBY_DOCDIR}/RMagick/ex/blur_image.jpg
@@ -130,6 +190,8 @@
 ${RUBY_DOCDIR}/RMagick/ex/chop_before.jpg
 ${RUBY_DOCDIR}/RMagick/ex/circle.gif
 ${RUBY_DOCDIR}/RMagick/ex/circle.rb
+${RUBY_DOCDIR}/RMagick/ex/circle01.gif
+${RUBY_DOCDIR}/RMagick/ex/circle01.rb
 ${RUBY_DOCDIR}/RMagick/ex/clip_path.gif
 ${RUBY_DOCDIR}/RMagick/ex/clip_path.rb
 ${RUBY_DOCDIR}/RMagick/ex/coalesce.gif
@@ -160,6 +222,10 @@
 ${RUBY_DOCDIR}/RMagick/ex/crop_before.jpg
 ${RUBY_DOCDIR}/RMagick/ex/crop_with_gravity.miff
 ${RUBY_DOCDIR}/RMagick/ex/crop_with_gravity.rb
+${RUBY_DOCDIR}/RMagick/ex/cubic01.gif
+${RUBY_DOCDIR}/RMagick/ex/cubic01.rb
+${RUBY_DOCDIR}/RMagick/ex/cubic02.gif
+${RUBY_DOCDIR}/RMagick/ex/cubic02.rb
 ${RUBY_DOCDIR}/RMagick/ex/cycle_colormap.gif
 ${RUBY_DOCDIR}/RMagick/ex/cycle_colormap.rb
 ${RUBY_DOCDIR}/RMagick/ex/demo.rb
@@ -172,18 +238,24 @@
 ${RUBY_DOCDIR}/RMagick/ex/edge.rb
 ${RUBY_DOCDIR}/RMagick/ex/ellipse.gif
 ${RUBY_DOCDIR}/RMagick/ex/ellipse.rb
+${RUBY_DOCDIR}/RMagick/ex/ellipse01.gif
+${RUBY_DOCDIR}/RMagick/ex/ellipse01.rb
 ${RUBY_DOCDIR}/RMagick/ex/emboss.jpg
 ${RUBY_DOCDIR}/RMagick/ex/emboss.rb
 ${RUBY_DOCDIR}/RMagick/ex/enhance.jpg
 ${RUBY_DOCDIR}/RMagick/ex/enhance.rb
 ${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/flatten_images.gif
 ${RUBY_DOCDIR}/RMagick/ex/flatten_images.rb
 ${RUBY_DOCDIR}/RMagick/ex/flip.jpg
 ${RUBY_DOCDIR}/RMagick/ex/flip.rb
 ${RUBY_DOCDIR}/RMagick/ex/flop.jpg
 ${RUBY_DOCDIR}/RMagick/ex/flop.rb
+${RUBY_DOCDIR}/RMagick/ex/font_styles.gif
+${RUBY_DOCDIR}/RMagick/ex/font_styles.rb
 ${RUBY_DOCDIR}/RMagick/ex/fonts.rb
 ${RUBY_DOCDIR}/RMagick/ex/frame.jpg
 ${RUBY_DOCDIR}/RMagick/ex/frame.rb
@@ -195,13 +267,17 @@
 ${RUBY_DOCDIR}/RMagick/ex/get_type_metrics.rb
 ${RUBY_DOCDIR}/RMagick/ex/get_pixels.jpg
 ${RUBY_DOCDIR}/RMagick/ex/get_pixels.rb
-${RUBY_DOCDIR}/RMagick/ex/gradientfill.rb
 ${RUBY_DOCDIR}/RMagick/ex/gradientfill.gif
+${RUBY_DOCDIR}/RMagick/ex/gradientfill.rb
 ${RUBY_DOCDIR}/RMagick/ex/grav.gif
 ${RUBY_DOCDIR}/RMagick/ex/grav.rb
 ${RUBY_DOCDIR}/RMagick/ex/gravity.rb
+${RUBY_DOCDIR}/RMagick/ex/group.gif
+${RUBY_DOCDIR}/RMagick/ex/group.rb
 ${RUBY_DOCDIR}/RMagick/ex/hatchfill.gif
 ${RUBY_DOCDIR}/RMagick/ex/hatchfill.rb
+${RUBY_DOCDIR}/RMagick/ex/image.gif
+${RUBY_DOCDIR}/RMagick/ex/image.rb
 ${RUBY_DOCDIR}/RMagick/ex/implode.gif
 ${RUBY_DOCDIR}/RMagick/ex/implode.rb
 ${RUBY_DOCDIR}/RMagick/ex/level.jpg
@@ -210,6 +286,8 @@
 ${RUBY_DOCDIR}/RMagick/ex/level_channel.rb
 ${RUBY_DOCDIR}/RMagick/ex/line.gif
 ${RUBY_DOCDIR}/RMagick/ex/line.rb
+${RUBY_DOCDIR}/RMagick/ex/line01.gif
+${RUBY_DOCDIR}/RMagick/ex/line01.rb
 ${RUBY_DOCDIR}/RMagick/ex/map.rb
 ${RUBY_DOCDIR}/RMagick/ex/map_after.jpg
 ${RUBY_DOCDIR}/RMagick/ex/map_before.jpg
@@ -240,6 +318,10 @@
 ${RUBY_DOCDIR}/RMagick/ex/negate.rb
 ${RUBY_DOCDIR}/RMagick/ex/negate_channel.jpg
 ${RUBY_DOCDIR}/RMagick/ex/negate_channel.rb
+${RUBY_DOCDIR}/RMagick/ex/nested_rvg.gif
+${RUBY_DOCDIR}/RMagick/ex/nested_rvg.rb
+${RUBY_DOCDIR}/RMagick/ex/nonzero.gif
+${RUBY_DOCDIR}/RMagick/ex/nonzero.rb
 ${RUBY_DOCDIR}/RMagick/ex/normalize.jpg
 ${RUBY_DOCDIR}/RMagick/ex/normalize.rb
 ${RUBY_DOCDIR}/RMagick/ex/oil_paint.jpg
@@ -259,14 +341,20 @@
 ${RUBY_DOCDIR}/RMagick/ex/pixels-array
 ${RUBY_DOCDIR}/RMagick/ex/polygon.gif
 ${RUBY_DOCDIR}/RMagick/ex/polygon.rb
+${RUBY_DOCDIR}/RMagick/ex/polygon01.gif
+${RUBY_DOCDIR}/RMagick/ex/polygon01.rb
 ${RUBY_DOCDIR}/RMagick/ex/polyline.gif
 ${RUBY_DOCDIR}/RMagick/ex/polyline.rb
+${RUBY_DOCDIR}/RMagick/ex/polyline01.gif
+${RUBY_DOCDIR}/RMagick/ex/polyline01.rb
 ${RUBY_DOCDIR}/RMagick/ex/posterize.jpg
 ${RUBY_DOCDIR}/RMagick/ex/posterize.rb
 ${RUBY_DOCDIR}/RMagick/ex/preview.jpg
 ${RUBY_DOCDIR}/RMagick/ex/preview.rb
 ${RUBY_DOCDIR}/RMagick/ex/qbezierpath.gif
 ${RUBY_DOCDIR}/RMagick/ex/qbezierpath.rb
+${RUBY_DOCDIR}/RMagick/ex/quad01.gif
+${RUBY_DOCDIR}/RMagick/ex/quad01.rb
 ${RUBY_DOCDIR}/RMagick/ex/quantize-m.rb
 ${RUBY_DOCDIR}/RMagick/ex/quantize-m_after.jpg
 ${RUBY_DOCDIR}/RMagick/ex/quantize-m_before.jpg
@@ -278,10 +366,26 @@
 ${RUBY_DOCDIR}/RMagick/ex/random_channel_threshold.rb
 ${RUBY_DOCDIR}/RMagick/ex/random_threshold_channel.jpg
 ${RUBY_DOCDIR}/RMagick/ex/random_threshold_channel.rb
+${RUBY_DOCDIR}/RMagick/ex/rect01.gif
+${RUBY_DOCDIR}/RMagick/ex/rect01.rb
+${RUBY_DOCDIR}/RMagick/ex/rect02.gif
+${RUBY_DOCDIR}/RMagick/ex/rect02.rb
 ${RUBY_DOCDIR}/RMagick/ex/rectangle.gif
 ${RUBY_DOCDIR}/RMagick/ex/rectangle.rb
 ${RUBY_DOCDIR}/RMagick/ex/reduce_noise.jpg
 ${RUBY_DOCDIR}/RMagick/ex/reduce_noise.rb
+${RUBY_DOCDIR}/RMagick/ex/rvg_clippath.gif
+${RUBY_DOCDIR}/RMagick/ex/rvg_clippath.rb
+${RUBY_DOCDIR}/RMagick/ex/rvg_linecap.gif
+${RUBY_DOCDIR}/RMagick/ex/rvg_linecap.rb
+${RUBY_DOCDIR}/RMagick/ex/rvg_linejoin.gif
+${RUBY_DOCDIR}/RMagick/ex/rvg_linejoin.rb
+${RUBY_DOCDIR}/RMagick/ex/rvg_opacity.gif
+${RUBY_DOCDIR}/RMagick/ex/rvg_opacity.rb
+${RUBY_DOCDIR}/RMagick/ex/rvg_pattern.gif
+${RUBY_DOCDIR}/RMagick/ex/rvg_pattern.rb
+${RUBY_DOCDIR}/RMagick/ex/rvg_stroke_dasharray.gif
+${RUBY_DOCDIR}/RMagick/ex/rvg_stroke_dasharray.rb
 ${RUBY_DOCDIR}/RMagick/ex/rm_demo_out.miff
 ${RUBY_DOCDIR}/RMagick/ex/rm_gravity_out.miff
 ${RUBY_DOCDIR}/RMagick/ex/roll.jpg
@@ -296,8 +400,13 @@
 ${RUBY_DOCDIR}/RMagick/ex/rubyname.rb
 ${RUBY_DOCDIR}/RMagick/ex/segment.jpg
 ${RUBY_DOCDIR}/RMagick/ex/segment.rb
+${RUBY_DOCDIR}/RMagick/ex/sepiatone.jpg
+${RUBY_DOCDIR}/RMagick/ex/sepiatone.rb
 ${RUBY_DOCDIR}/RMagick/ex/shade.jpg
 ${RUBY_DOCDIR}/RMagick/ex/shade.rb
+${RUBY_DOCDIR}/RMagick/ex/shadow.rb
+${RUBY_DOCDIR}/RMagick/ex/shadow_after.gif
+${RUBY_DOCDIR}/RMagick/ex/shadow_before.gif
 ${RUBY_DOCDIR}/RMagick/ex/shave.jpg
 ${RUBY_DOCDIR}/RMagick/ex/shave.rb
 ${RUBY_DOCDIR}/RMagick/ex/shear.jpg
@@ -318,6 +427,8 @@
 ${RUBY_DOCDIR}/RMagick/ex/stegano.rb
 ${RUBY_DOCDIR}/RMagick/ex/stroke_dasharray.gif
 ${RUBY_DOCDIR}/RMagick/ex/stroke_dasharray.rb
+${RUBY_DOCDIR}/RMagick/ex/stroke_fill.gif
+${RUBY_DOCDIR}/RMagick/ex/stroke_fill.rb
 ${RUBY_DOCDIR}/RMagick/ex/stroke_linecap.gif
 ${RUBY_DOCDIR}/RMagick/ex/stroke_linecap.rb
 ${RUBY_DOCDIR}/RMagick/ex/stroke_linejoin.gif
@@ -332,8 +443,12 @@
 ${RUBY_DOCDIR}/RMagick/ex/text_align.rb
 ${RUBY_DOCDIR}/RMagick/ex/text_antialias.gif
 ${RUBY_DOCDIR}/RMagick/ex/text_antialias.rb
+${RUBY_DOCDIR}/RMagick/ex/text_styles.gif
+${RUBY_DOCDIR}/RMagick/ex/text_styles.rb
 ${RUBY_DOCDIR}/RMagick/ex/text_undercolor.gif
 ${RUBY_DOCDIR}/RMagick/ex/text_undercolor.rb
+${RUBY_DOCDIR}/RMagick/ex/text01.gif
+${RUBY_DOCDIR}/RMagick/ex/text01.rb
 ${RUBY_DOCDIR}/RMagick/ex/texture_fill_to_border.rb
 ${RUBY_DOCDIR}/RMagick/ex/texture_fill_to_border_after.gif
 ${RUBY_DOCDIR}/RMagick/ex/texture_fill_to_border_before.gif
@@ -351,30 +466,57 @@
 ${RUBY_DOCDIR}/RMagick/ex/transparent.rb
 ${RUBY_DOCDIR}/RMagick/ex/transparent_after.gif
 ${RUBY_DOCDIR}/RMagick/ex/transparent_before.gif
+${RUBY_DOCDIR}/RMagick/ex/tref01.gif
+${RUBY_DOCDIR}/RMagick/ex/tref01.rb
+${RUBY_DOCDIR}/RMagick/ex/triangle01.gif
+${RUBY_DOCDIR}/RMagick/ex/triangle01.rb
 ${RUBY_DOCDIR}/RMagick/ex/trim.rb
 ${RUBY_DOCDIR}/RMagick/ex/trim_after.jpg
 ${RUBY_DOCDIR}/RMagick/ex/trim_before.jpg
+${RUBY_DOCDIR}/RMagick/ex/tspan01.gif
+${RUBY_DOCDIR}/RMagick/ex/tspan01.rb
+${RUBY_DOCDIR}/RMagick/ex/tspan02.gif
+${RUBY_DOCDIR}/RMagick/ex/tspan02.rb
+${RUBY_DOCDIR}/RMagick/ex/tspan03.gif
+${RUBY_DOCDIR}/RMagick/ex/tspan03.rb
 ${RUBY_DOCDIR}/RMagick/ex/unsharp_mask.jpg
 ${RUBY_DOCDIR}/RMagick/ex/unsharp_mask.rb
 ${RUBY_DOCDIR}/RMagick/ex/viewex.gif
 ${RUBY_DOCDIR}/RMagick/ex/viewex.rb
 ${RUBY_DOCDIR}/RMagick/ex/wave.jpg
 ${RUBY_DOCDIR}/RMagick/ex/wave.rb
+${RUBY_DOCDIR}/RMagick/ex/writing_mode01.gif
+${RUBY_DOCDIR}/RMagick/ex/writing_mode01.rb
+${RUBY_DOCDIR}/RMagick/ex/writing_mode02.gif
+${RUBY_DOCDIR}/RMagick/ex/writing_mode02.rb
 @dirrm ${RUBY_DOCDIR}/RMagick/ex
 ${RUBY_DOCDIR}/RMagick/scripts/.rmagick
 ${RUBY_DOCDIR}/RMagick/scripts/doc.js
 @dirrm ${RUBY_DOCDIR}/RMagick/scripts
 ${RUBY_DOCDIR}/RMagick/.rmagick
 ${RUBY_DOCDIR}/RMagick/Adispatch.rb.html
+${RUBY_DOCDIR}/RMagick/InitialCoords.rb.html
+${RUBY_DOCDIR}/RMagick/NewCoordSys.rb.html
+${RUBY_DOCDIR}/RMagick/OrigCoordSys.rb.html
+${RUBY_DOCDIR}/RMagick/PreserveAspectRatio.rb.html
+${RUBY_DOCDIR}/RMagick/RotateScale.rb.html
+${RUBY_DOCDIR}/RMagick/Skew.rb.html
+${RUBY_DOCDIR}/RMagick/Use01.rb.html
+${RUBY_DOCDIR}/RMagick/Use02.rb.html
+${RUBY_DOCDIR}/RMagick/Use03.rb.html
+${RUBY_DOCDIR}/RMagick/ViewBox.rb.html
 ${RUBY_DOCDIR}/RMagick/Zconstitute.rb.html
 ${RUBY_DOCDIR}/RMagick/adaptive_threshold.rb.html
 ${RUBY_DOCDIR}/RMagick/add_noise.rb.html
 ${RUBY_DOCDIR}/RMagick/affine.rb.html
 ${RUBY_DOCDIR}/RMagick/affine_transform.rb.html
 ${RUBY_DOCDIR}/RMagick/arc.rb.html
+${RUBY_DOCDIR}/RMagick/arcs01.rb.html
+${RUBY_DOCDIR}/RMagick/arcs02.rb.html
 ${RUBY_DOCDIR}/RMagick/arcpath.rb.html
 ${RUBY_DOCDIR}/RMagick/average.rb.html
 ${RUBY_DOCDIR}/RMagick/axes.rb.html
+${RUBY_DOCDIR}/RMagick/baseline_shift01.rb.html
 ${RUBY_DOCDIR}/RMagick/bilevel_channel.rb.html
 ${RUBY_DOCDIR}/RMagick/blur_image.rb.html
 ${RUBY_DOCDIR}/RMagick/border.rb.html
@@ -390,6 +532,7 @@
 ${RUBY_DOCDIR}/RMagick/charcoal.rb.html
 ${RUBY_DOCDIR}/RMagick/chop.rb.html
 ${RUBY_DOCDIR}/RMagick/circle.rb.html
+${RUBY_DOCDIR}/RMagick/circle01.rb.html
 ${RUBY_DOCDIR}/RMagick/clip_path.rb.html
 ${RUBY_DOCDIR}/RMagick/coalesce.rb.html
 ${RUBY_DOCDIR}/RMagick/color_fill_to_border.rb.html
@@ -404,6 +547,8 @@
 ${RUBY_DOCDIR}/RMagick/contrast.rb.html
 ${RUBY_DOCDIR}/RMagick/crop.rb.html
 ${RUBY_DOCDIR}/RMagick/crop_with_gravity.rb.html
+${RUBY_DOCDIR}/RMagick/cubic01.rb.html
+${RUBY_DOCDIR}/RMagick/cubic02.rb.html
 ${RUBY_DOCDIR}/RMagick/cycle_colormap.rb.html
 ${RUBY_DOCDIR}/RMagick/demo.rb.html
 ${RUBY_DOCDIR}/RMagick/draw.html
@@ -411,12 +556,15 @@
 ${RUBY_DOCDIR}/RMagick/drop_shadow.rb.html
 ${RUBY_DOCDIR}/RMagick/edge.rb.html
 ${RUBY_DOCDIR}/RMagick/ellipse.rb.html
+${RUBY_DOCDIR}/RMagick/ellipse01.rb.html
 ${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/flatten_images.rb.html
 ${RUBY_DOCDIR}/RMagick/flip.rb.html
 ${RUBY_DOCDIR}/RMagick/flop.rb.html
+${RUBY_DOCDIR}/RMagick/font_styles.rb.html
 ${RUBY_DOCDIR}/RMagick/fonts.rb.html
 ${RUBY_DOCDIR}/RMagick/frame.rb.html
 ${RUBY_DOCDIR}/RMagick/gaussian_blur.rb.html
@@ -426,8 +574,10 @@
 ${RUBY_DOCDIR}/RMagick/gradientfill.rb.html
 ${RUBY_DOCDIR}/RMagick/grav.rb.html
 ${RUBY_DOCDIR}/RMagick/gravity.rb.html
+${RUBY_DOCDIR}/RMagick/group.rb.html
 ${RUBY_DOCDIR}/RMagick/hatchfill.rb.html
 ${RUBY_DOCDIR}/RMagick/ilist.html
+${RUBY_DOCDIR}/RMagick/image.rb.html
 ${RUBY_DOCDIR}/RMagick/image1.html
 ${RUBY_DOCDIR}/RMagick/image2.html
 ${RUBY_DOCDIR}/RMagick/image3.html
@@ -439,6 +589,7 @@
 ${RUBY_DOCDIR}/RMagick/level.rb.html
 ${RUBY_DOCDIR}/RMagick/level_channel.rb.html
 ${RUBY_DOCDIR}/RMagick/line.rb.html
+${RUBY_DOCDIR}/RMagick/line01.rb.html
 ${RUBY_DOCDIR}/RMagick/magick.html
 ${RUBY_DOCDIR}/RMagick/map.rb.html
 ${RUBY_DOCDIR}/RMagick/map_f.rb.html
@@ -453,6 +604,8 @@
 ${RUBY_DOCDIR}/RMagick/motion_blur.rb.html
 ${RUBY_DOCDIR}/RMagick/negate.rb.html
 ${RUBY_DOCDIR}/RMagick/negate_channel.rb.html
+${RUBY_DOCDIR}/RMagick/nested_rvg.rb.html
+${RUBY_DOCDIR}/RMagick/nonzero.rb.html
 ${RUBY_DOCDIR}/RMagick/normalize.rb.html
 ${RUBY_DOCDIR}/RMagick/oil_paint.rb.html
 ${RUBY_DOCDIR}/RMagick/opacity.rb.html
@@ -462,15 +615,20 @@
 ${RUBY_DOCDIR}/RMagick/pattern1.rb.html
 ${RUBY_DOCDIR}/RMagick/pattern2.rb.html
 ${RUBY_DOCDIR}/RMagick/polygon.rb.html
+${RUBY_DOCDIR}/RMagick/polygon01.rb.html
 ${RUBY_DOCDIR}/RMagick/polyline.rb.html
+${RUBY_DOCDIR}/RMagick/polyline01.rb.html
 ${RUBY_DOCDIR}/RMagick/posterize.rb.html
 ${RUBY_DOCDIR}/RMagick/preview.rb.html
 ${RUBY_DOCDIR}/RMagick/qbezierpath.rb.html
+${RUBY_DOCDIR}/RMagick/quad01.rb.html
 ${RUBY_DOCDIR}/RMagick/quantize-m.rb.html
 ${RUBY_DOCDIR}/RMagick/radial_blur.rb.html
 ${RUBY_DOCDIR}/RMagick/raise.rb.html
 ${RUBY_DOCDIR}/RMagick/random_channel_threshold.rb.html
 ${RUBY_DOCDIR}/RMagick/random_threshold_channel.rb.html
+${RUBY_DOCDIR}/RMagick/rect01.rb.html
+${RUBY_DOCDIR}/RMagick/rect02.rb.html
 ${RUBY_DOCDIR}/RMagick/rectangle.rb.html
 ${RUBY_DOCDIR}/RMagick/reduce_noise.rb.html
 ${RUBY_DOCDIR}/RMagick/roll.rb.html
@@ -478,8 +636,28 @@
 ${RUBY_DOCDIR}/RMagick/rotate_f.rb.html
 ${RUBY_DOCDIR}/RMagick/roundrect.rb.html
 ${RUBY_DOCDIR}/RMagick/rubyname.rb.html
+${RUBY_DOCDIR}/RMagick/rvg.html
+${RUBY_DOCDIR}/RMagick/rvg_clippath.rb.html
+${RUBY_DOCDIR}/RMagick/rvg_linecap.rb.html
+${RUBY_DOCDIR}/RMagick/rvg_linejoin.rb.html
+${RUBY_DOCDIR}/RMagick/rvg_opacity.rb.html
+${RUBY_DOCDIR}/RMagick/rvg_pattern.rb.html
+${RUBY_DOCDIR}/RMagick/rvg_stroke_dasharray.rb.html
+${RUBY_DOCDIR}/RMagick/rvgclip.html
+${RUBY_DOCDIR}/RMagick/rvggroup.html
+${RUBY_DOCDIR}/RMagick/rvgimage.html
+${RUBY_DOCDIR}/RMagick/rvgpattern.html
+${RUBY_DOCDIR}/RMagick/rvgshape.html
+${RUBY_DOCDIR}/RMagick/rvgstyle.html
+${RUBY_DOCDIR}/RMagick/rvgtext.html
+${RUBY_DOCDIR}/RMagick/rvgtspan.html
+${RUBY_DOCDIR}/RMagick/rvgtut.html
+${RUBY_DOCDIR}/RMagick/rvguse.html
+${RUBY_DOCDIR}/RMagick/rvgxform.html
 ${RUBY_DOCDIR}/RMagick/segment.rb.html
+${RUBY_DOCDIR}/RMagick/sepiatone.rb.html
 ${RUBY_DOCDIR}/RMagick/shade.rb.html
+${RUBY_DOCDIR}/RMagick/shadow.rb.html
 ${RUBY_DOCDIR}/RMagick/shave.rb.html
 ${RUBY_DOCDIR}/RMagick/shear.rb.html
 ${RUBY_DOCDIR}/RMagick/skewx.rb.html
@@ -490,14 +668,17 @@
 ${RUBY_DOCDIR}/RMagick/spread.rb.html
 ${RUBY_DOCDIR}/RMagick/stegano.rb.html
 ${RUBY_DOCDIR}/RMagick/stroke_dasharray.rb.html
+${RUBY_DOCDIR}/RMagick/stroke_fill.rb.html
 ${RUBY_DOCDIR}/RMagick/stroke_linecap.rb.html
 ${RUBY_DOCDIR}/RMagick/stroke_linejoin.rb.html
 ${RUBY_DOCDIR}/RMagick/stroke_width.rb.html
 ${RUBY_DOCDIR}/RMagick/struct.html
 ${RUBY_DOCDIR}/RMagick/swirl.rb.html
 ${RUBY_DOCDIR}/RMagick/text.rb.html
+${RUBY_DOCDIR}/RMagick/text01.rb.html
 ${RUBY_DOCDIR}/RMagick/text_align.rb.html
 ${RUBY_DOCDIR}/RMagick/text_antialias.rb.html
+${RUBY_DOCDIR}/RMagick/text_styles.rb.html
 ${RUBY_DOCDIR}/RMagick/text_undercolor.rb.html
 ${RUBY_DOCDIR}/RMagick/texture_fill_to_border.rb.html
 ${RUBY_DOCDIR}/RMagick/texture_floodfill.rb.html
@@ -506,9 +687,17 @@
 ${RUBY_DOCDIR}/RMagick/to_blob.rb.html
 ${RUBY_DOCDIR}/RMagick/translate.rb.html
 ${RUBY_DOCDIR}/RMagick/transparent.rb.html
+${RUBY_DOCDIR}/RMagick/tref01.rb.html
+${RUBY_DOCDIR}/RMagick/triangle01.rb.html
 ${RUBY_DOCDIR}/RMagick/trim.rb.html
+${RUBY_DOCDIR}/RMagick/tspan01.rb.html
+${RUBY_DOCDIR}/RMagick/tspan02.rb.html
+${RUBY_DOCDIR}/RMagick/tspan03.rb.html
 ${RUBY_DOCDIR}/RMagick/unsharp_mask.rb.html
 ${RUBY_DOCDIR}/RMagick/usage.html
 ${RUBY_DOCDIR}/RMagick/viewex.rb.html
 ${RUBY_DOCDIR}/RMagick/wave.rb.html
+${RUBY_DOCDIR}/RMagick/writing_mode01.rb.html
+${RUBY_DOCDIR}/RMagick/writing_mode02.rb.html
+@dirrm ${RUBY_SITELIBDIR}/rvg
 @dirrm ${RUBY_DOCDIR}/RMagick
Index: graphics/ruby-RMagick/distinfo
===================================================================
RCS file: /home/cvsroot/NetBSD/pkgsrc/graphics/ruby-RMagick/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- graphics/ruby-RMagick/distinfo	6 Apr 2005 14:54:02 -0000	1.1.1.1
+++ graphics/ruby-RMagick/distinfo	8 May 2005 01:22:28 -0000
@@ -1,6 +1,9 @@
 $NetBSD: distinfo,v 1.1.1.1 2005/04/06 14:54:02 minskim Exp $
 
-SHA1 (ruby/RMagick-1.7.4.tar.gz) = 0d29060e2187a67e733e4590f69cf41232f3660e
-RMD160 (ruby/RMagick-1.7.4.tar.gz) = 740ce8382c72db05ff67d1a06a43728ee7df604c
-Size (ruby/RMagick-1.7.4.tar.gz) = 807047 bytes
-SHA1 (patch-aa) = c4d0a62f41159b85dbd43b0a41be2a28242cdf38
+SHA1 (ruby/RMagick-1.8.0.tar.gz) = a6526dbf2ec6ba5b31b7629c75e7b06171ed30d5
+RMD160 (ruby/RMagick-1.8.0.tar.gz) = a4fd8b3d41607ca3d55b20bc64dff9f07b662bca
+Size (ruby/RMagick-1.8.0.tar.gz) = 971790 bytes
+SHA1 (patch-aa) = 3b3544191a7b1d7bd60bc4cb4f37eb48c854b2d5
+SHA1 (patch-ab) = dfb6e10a6a03270cb80f12ed66222445987b137c
+SHA1 (patch-ac) = 3ca1cdec38fa4232a25bc571eec74cc0d422b505
+SHA1 (patch-ad) = 00356b1afde545a177174c7e008627c6d2984d80
Index: graphics/ruby-RMagick/patches/patch-aa
===================================================================
RCS file: /home/cvsroot/NetBSD/pkgsrc/graphics/ruby-RMagick/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- graphics/ruby-RMagick/patches/patch-aa	6 Apr 2005 14:54:02 -0000	1.1.1.1
+++ graphics/ruby-RMagick/patches/patch-aa	8 May 2005 01:19:17 -0000
@@ -1,19 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/06 14:54:02 minskim Exp $
+$NetBSD$
 
---- ext/RMagick/rmfill.c.orig	2004-12-18 07:44:06.000000000 +0900
-+++ ext/RMagick/rmfill.c
-@@ -8,6 +8,14 @@
+--- ext/RMagick/extconf.rb.in.orig	2004-11-29 10:00:16.000000000 +0900
++++ ext/RMagick/extconf.rb.in
+@@ -6,7 +6,7 @@ require 'mkmf'
+ # Pass along Ruby's version number
+ VERSION_NUMBER = '0x'+RUBY_VERSION.tr('.','')
  
- #include "rmagick.h"
+-$CFLAGS = "-std=gnu99 -Wall -g @CFLAGS@"
++$CFLAGS = "-Wall -g @CFLAGS@"
+ $CPPFLAGS = "-DRUBY_VERSION=#{VERSION_NUMBER} @CPPFLAGS@"
  
-+#ifdef __NetBSD__
-+#define fmax(x, y) my_fmax(x, y)
-+static double my_fmax(double x, double y)
-+{
-+	return x > y ? x : y;
-+}
-+#endif
-+
- typedef struct
- {
-     double x1, y1, x2, y2;
+ if RUBY_VERSION >= '1.8.0'
Index: graphics/ruby-RMagick/patches/patch-ab
===================================================================
RCS file: graphics/ruby-RMagick/patches/patch-ab
diff -N graphics/ruby-RMagick/patches/patch-ab
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ graphics/ruby-RMagick/patches/patch-ab	8 May 2005 01:19:43 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- ext/RMagick/rmagick.h.orig	2005-04-29 08:41:54.000000000 +0900
++++ ext/RMagick/rmagick.h
+@@ -61,6 +61,10 @@
+ #undef DegreesToRadians     // defined in ImageMagick.h in 6.0.2
+ #define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0)
+ 
++#define LMAX(a,b) ((((long)(a))>((long)(b)))?((long)(a)):((long)(b))) 
++#define FMAX(a,b) ((((double)(a))>((double)(b)))?((double)(a)):((double)(b))) 
++#define FMIN(a,b) ((((double)(a))<=((double)(b)))?((double)(a)):((double)(b))) 
++
+ typedef ImageInfo Info; // Make type name match class name
+ typedef PixelPacket Pixel;
+ 
Index: graphics/ruby-RMagick/patches/patch-ac
===================================================================
RCS file: graphics/ruby-RMagick/patches/patch-ac
diff -N graphics/ruby-RMagick/patches/patch-ac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ graphics/ruby-RMagick/patches/patch-ac	8 May 2005 01:19:56 -0000
@@ -0,0 +1,66 @@
+$NetBSD$
+
+--- ext/RMagick/rmfill.c.orig	2005-03-06 01:18:39.000000000 +0900
++++ ext/RMagick/rmfill.c
+@@ -168,7 +168,7 @@ vertical_fill(
+     // Keep in mind that x1 could be < 0 or > image->columns. If steps
+     // is negative, swap the start and end colors and use the absolute
+     // value.
+-    steps = fmax(x1, ((long)image->columns)-x1);
++    steps = FMAX(x1, ((long)image->columns)-x1);
+     if (steps < 0)
+     {
+         PixelPacket t = *start_color;
+@@ -240,7 +240,7 @@ horizontal_fill(
+ 
+     // Bear in mind that y1 could be < 0 or > image->rows. If steps is
+     // negative, swap the start and end colors and use the absolute value.
+-    steps = fmax(y1, ((long)image->rows)-y1);
++    steps = FMAX(y1, ((long)image->rows)-y1);
+     if (steps < 0)
+     {
+         PixelPacket t = *start_color;
+@@ -323,16 +323,16 @@ v_diagonal_fill(
+ 
+     if (d1 < 0 && d2 < 0)
+     {
+-        steps += fmax(fabs(d1),fabs(d2));
++        steps += FMAX(fabs(d1),fabs(d2));
+     }
+     else if (d1 > image->rows && d2 > image->rows)
+     {
+-        steps += fmax(d1-image->rows, d2-image->rows);
++        steps += FMAX(d1-image->rows, d2-image->rows);
+     }
+ 
+-    d1 = fmax(b, image->rows-b);
+-    d2 = fmax(d2, image->rows-d2);
+-    steps += fmax(d1, d2);
++    d1 = FMAX(b, image->rows-b);
++    d2 = FMAX(d2, image->rows-d2);
++    steps += FMAX(d1, d2);
+ 
+     // If the line is entirely > image->rows, swap the start & end color
+     if (steps < 0)
+@@ -404,16 +404,16 @@ h_diagonal_fill(
+     // the number of steps.
+     if (d1 < 0 && d2 < 0)
+     {
+-        steps += fmax(fabs(d1),fabs(d2));
++        steps += FMAX(fabs(d1),fabs(d2));
+     }
+     else if (d1 > image->columns && d2 > image->columns)
+     {
+-        steps += fmax(fabs(image->columns-d1),fabs(image->columns-d2));
++        steps += FMAX(fabs(image->columns-d1),fabs(image->columns-d2));
+     }
+ 
+-    d1 = fmax(d1, image->columns-d1);
+-    d2 = fmax(d2, image->columns-d2);
+-    steps += fmax(d1, d2);
++    d1 = FMAX(d1, image->columns-d1);
++    d2 = FMAX(d2, image->columns-d2);
++    steps += FMAX(d1, d2);
+ 
+     // If the line is entirely > image->columns, swap the start & end color
+     if (steps < 0)
Index: graphics/ruby-RMagick/patches/patch-ad
===================================================================
RCS file: graphics/ruby-RMagick/patches/patch-ad
diff -N graphics/ruby-RMagick/patches/patch-ad
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ graphics/ruby-RMagick/patches/patch-ad	8 May 2005 01:20:07 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- ext/RMagick/rmimage.c.orig	2005-05-01 00:26:45.000000000 +0900
++++ ext/RMagick/rmimage.c
+@@ -6476,8 +6476,8 @@ Image_shadow(int argc, VALUE *argv, VALU
+             {
+                 rb_warning("shadow will be transparent - opacity %g very small", opacity);
+             }
+-            opacity = fmin(opacity, 1.0);
+-            opacity = fmax(opacity, 0.01);
++            opacity = FMIN(opacity, 1.0);
++            opacity = FMAX(opacity, 0.01);
+             opacity *= 100.0;
+         case 3:
+             sigma = NUM2DBL(argv[2]);