3 files changed, 23 insertions, 13 deletions

diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index 5c303fc889df..7ac8e4615f12 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	rmagick
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	1.7.0
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/550/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/2231/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	RMagick-${PORTVERSION}
 DIST_SUBDIR=	ruby
@@ -23,18 +22,14 @@ COMMENT=	A Ruby binding for ImageMagick
 
 LIB_DEPENDS=	Magick.7:${PORTSDIR}/graphics/ImageMagick
 
-BROKEN=		"Does not compile"
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	${BROKEN}
-
-USE_BZIP2=	yes
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
 RUBY_SETUP=	install.rb
 
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -I${X11BASE}/lib" \
 		RUBY="${RUBY}"
 CONFIGURE_ARGS=	--doc-dir="${RUBY_MODDOCDIR}"
 
diff --git a/graphics/ruby-rmagick/distinfo b/graphics/ruby-rmagick/distinfo
index fa1e3587b432..fb5ec10c3ce1 100644
--- a/graphics/ruby-rmagick/distinfo
+++ b/graphics/ruby-rmagick/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/RMagick-1.5.0.tar.bz2) = 282164e8548262110a4d4fd6d9d4d4ff
-SIZE (ruby/RMagick-1.5.0.tar.bz2) = 767507
+MD5 (ruby/RMagick-1.7.0.tar.gz) = d2b6c0970ebd90d3e37f5e7e35b78ca7
+SIZE (ruby/RMagick-1.7.0.tar.gz) = 806446
diff --git a/graphics/ruby-rmagick/pkg-plist b/graphics/ruby-rmagick/pkg-plist
index 6468d0e2cc6f..e71481c54d12 100644
--- a/graphics/ruby-rmagick/pkg-plist
+++ b/graphics/ruby-rmagick/pkg-plist
@@ -172,8 +172,12 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/frame.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/gaussian_blur.jpg
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/gaussian_blur.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/get_multiline_type_metrics.gif
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/get_multiline_type_metrics.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/get_pixels.jpg
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/get_pixels.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/get_type_metrics.gif
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/get_type_metrics.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/gradientfill.gif
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/gradientfill.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/grav.gif
@@ -236,7 +240,6 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/images/logo400x83.gif
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/images/model.miff
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/images/notimplemented.gif
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/images/small.tif
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/images/smile.miff
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/images/spin.gif
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/implode.gif
@@ -298,6 +301,8 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/polygon.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/polyline.gif
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/polyline.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/posterize.jpg
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/posterize.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/preview.jpg
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/preview.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/qbezierpath.gif
@@ -345,6 +350,8 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/smile.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/solarize.jpg
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/solarize.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/splice.jpg
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/splice.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/spread.jpg
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/spread.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/stegano.gif
@@ -384,6 +391,9 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/transparent.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/transparent_after.gif
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/transparent_before.gif
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/trim.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/trim_after.jpg
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/trim_before.jpg
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/unsharp_mask.jpg
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/unsharp_mask.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/viewex.gif
@@ -396,7 +406,9 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/fonts.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/frame.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/gaussian_blur.rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/get_multiline_type_metrics.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/get_pixels.rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/get_type_metrics.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/gradientfill.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/grav.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/gravity.rb.html
@@ -437,6 +449,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/pattern2.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/polygon.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/polyline.rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/posterize.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/preview.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/qbezierpath.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/quantize-m.rb.html
@@ -461,6 +474,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/skewy.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/smile.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/solarize.rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/splice.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/spread.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/stegano.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/stroke_dasharray.rb.html
@@ -480,6 +494,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/to_blob.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/translate.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/transparent.rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/trim.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/unsharp_mask.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/viewex.rb.html