4 files changed, 24 insertions, 24 deletions

diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index e527bfe15bc4..1787e226b2d8 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rmagick
-PORTVERSION=	1.15.13
+PORTVERSION=	2.3.0
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,6 +17,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A Ruby binding for ImageMagick
 
+LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+
 USE_BZIP2=	yes
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
@@ -31,24 +33,10 @@ CONFIGURE_ARGS=	--doc-dir="${RUBY_MODDOCDIR}" --prefix="${PREFIX}"
 CONFIGURE_ARGS+=	--disable-htmldoc
 .endif
 
-OPTIONSFILE?=	${PORT_DBDIR}/${DIST_SUBDIR}-${PORTNAME}/options
-
-OPTIONS=	GRAPHICSMAGICK "Use GraphicsMagick instead of ImageMagick" Off
-
 DOCS=		ChangeLog README.html
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GRAPHICSMAGICK)
-LIB_DEPENDS+=	GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick
-.else
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
-.endif
-
-pre-configure:
-	cd ${CONFIGURE_WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ./configure --prefix="${PREFIX}"
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
diff --git a/graphics/ruby-rmagick/distinfo b/graphics/ruby-rmagick/distinfo
index b24e8bc28806..1593a1b4f55d 100644
--- a/graphics/ruby-rmagick/distinfo
+++ b/graphics/ruby-rmagick/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/RMagick-1.15.13.tar.bz2) = b8efbc6c1b82322aee26acd33dc37972
-SHA256 (ruby/RMagick-1.15.13.tar.bz2) = b2ed07e45796c3242815922cce8451eca249930c5ee33a6bf261469ac6596c93
-SIZE (ruby/RMagick-1.15.13.tar.bz2) = 974642
+MD5 (ruby/RMagick-2.3.0.tar.bz2) = 05990dedf592118315856b1d28e051a7
+SHA256 (ruby/RMagick-2.3.0.tar.bz2) = d85b2c06a8d5ae87a52e7746810fa7698e9be9a0ad3f1572ebe963de5125133d
+SIZE (ruby/RMagick-2.3.0.tar.bz2) = 929940
diff --git a/graphics/ruby-rmagick/files/patch-setup.rb b/graphics/ruby-rmagick/files/patch-setup.rb
index 5951e653a355..008061fa92e4 100644
--- a/graphics/ruby-rmagick/files/patch-setup.rb
+++ b/graphics/ruby-rmagick/files/patch-setup.rb
@@ -1,5 +1,14 @@
---- setup.rb.orig	Tue Aug 29 19:50:14 2006
-+++ setup.rb	Tue Aug 29 19:51:57 2006
+--- setup.rb.orig	2006-04-27 02:28:12.000000000 +0400
++++ setup.rb	2008-04-29 21:18:38.101609901 +0400
+@@ -147,7 +147,7 @@
+   def standard_entries(rbconfig)
+     c = rbconfig
+ 
+-    rubypath = File.join(c['bindir'], c['ruby_install_name'] + c['EXEEXT'])
++    rubypath = ENV['RUBY'] || File.join(c['bindir'], c['ruby_install_name'] + c['EXEEXT'])
+ 
+     major = c['MAJOR'].to_i
+     minor = c['MINOR'].to_i
 @@ -227,17 +227,17 @@
                     'the directory for system configuration files'),
        PathItem.new('localstatedir', 'path', parameterize.call(c['localstatedir']),
diff --git a/graphics/ruby-rmagick/pkg-plist b/graphics/ruby-rmagick/pkg-plist
index 9027de376552..748ac6cb0861 100644
--- a/graphics/ruby-rmagick/pkg-plist
+++ b/graphics/ruby-rmagick/pkg-plist
@@ -1,5 +1,5 @@
 %%RUBY_SITELIBDIR%%/RMagick.rb
-%%RUBY_SITEARCHLIBDIR%%/RMagick.so
+%%RUBY_SITEARCHLIBDIR%%/RMagick2.so
 %%RUBY_SITELIBDIR%%/rvg/clippath.rb
 %%RUBY_SITELIBDIR%%/rvg/container.rb
 %%RUBY_SITELIBDIR%%/rvg/deep_equal.rb
@@ -15,7 +15,6 @@
 %%RUBY_SITELIBDIR%%/rvg/transformable.rb
 %%RUBY_SITELIBDIR%%/rvg/units.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/.rmagick
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Adispatch.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/InitialCoords.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/NewCoordSys.rb.html
@@ -28,7 +27,6 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/Use02.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/Use03.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ViewBox.rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Zconstitute.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/adaptive_threshold.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/add_noise.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/affine.rb.html
@@ -64,11 +62,11 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/colorize.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/colors.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/composite.rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/composite_layers.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/comtasks.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/constants.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/contrast.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/crop.rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/crop_resized.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/crop_with_gravity.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/css/.rmagick
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/css/doc.css
@@ -88,6 +86,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/enhance.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/equalize.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/evenodd.rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/fill_pattern.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/flatten_images.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/flip.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/flop.rb.html
@@ -158,6 +157,8 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rect02.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rectangle.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/reduce_noise.rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/resize_to_fill.rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/resize_to_fit.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/roll.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rotate.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rotate_f.rb.html
@@ -235,6 +236,8 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/wet_floor.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/writing_mode01.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/writing_mode02.rb.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/constitute.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/crop_with_gravity.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/describe.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/find_similar_region.rb