3 files changed, 20 insertions, 23 deletions

diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index bd4f80dd7853..7cdc532c34dc 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -6,30 +6,22 @@
 #
 
 PORTNAME=	rmagick
-PORTVERSION=	1.9.3
-PORTREVISION=	2
+PORTVERSION=	1.11.0
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://rubyforge.lauschmusik.de/rmagick/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	RMagick-${PORTVERSION}
 DIST_SUBDIR=	ruby
-OPTIONSFILE?=	${PORT_DBDIR}/${DIST_SUBDIR}-${PORTNAME}/options
-
-#PATCH_SITES=	http://rubyforge.org/download.php/10/
-#PATCHFILES=	RMagick-${PORTVERSION}.patch
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Ruby binding for ImageMagick
 
-OPTIONS= GRAPHICSMAGICK "Use GraphicsMagick instead of ImageMagick" Off
-
 BUILD_DEPENDS=	wmf2eps:${PORTSDIR}/graphics/libwmf
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
-RUBY_SETUP=	install.rb
+RUBY_SETUP=	setup.rb
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -37,18 +29,18 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
 		RUBY="${RUBY}"
 CONFIGURE_ARGS=	--doc-dir="${RUBY_MODDOCDIR}"
 
+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
+LIB_DEPENDS+=	GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick
 .else
-LIB_DEPENDS=Magick.10:${PORTSDIR}/graphics/ImageMagick
-.endif
-
-.if ${OSVERSION} < 500000
-BROKEN=		"Does not compile on FreeBSD 4.x"
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 pre-configure:
@@ -57,11 +49,11 @@ pre-configure:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODDOCDIR}
+	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
 .endif
 
diff --git a/graphics/ruby-rmagick/distinfo b/graphics/ruby-rmagick/distinfo
index 4fdcd592a3fd..4ad9bf513e5b 100644
--- a/graphics/ruby-rmagick/distinfo
+++ b/graphics/ruby-rmagick/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/RMagick-1.9.3.tar.bz2) = 2765dfa6bcb34a6834d0ee8b82150379
-SHA256 (ruby/RMagick-1.9.3.tar.bz2) = 605c6d20d0acbb0d9042e4b800a2c2c01c8a19f3e039477a779e3416b9f64ab9
-SIZE (ruby/RMagick-1.9.3.tar.bz2) = 916176
+MD5 (ruby/RMagick-1.11.0.tar.bz2) = 23536b3f61b818c64dda5f56a4153145
+SHA256 (ruby/RMagick-1.11.0.tar.bz2) = 00e87bcbc017b04719a9a362e4d8a2ae91fa0ef447cca75eecc3b40ff9a8214f
+SIZE (ruby/RMagick-1.11.0.tar.bz2) = 927864
diff --git a/graphics/ruby-rmagick/pkg-plist b/graphics/ruby-rmagick/pkg-plist
index aa587aae5678..28df8d393a30 100644
--- a/graphics/ruby-rmagick/pkg-plist
+++ b/graphics/ruby-rmagick/pkg-plist
@@ -68,6 +68,7 @@
 %%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
@@ -339,6 +340,8 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/tspan03.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/unsharp_mask.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/viewex.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/vignette.jpg
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/vignette.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/wave.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/writing_mode01.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/writing_mode02.rb
@@ -483,6 +486,8 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/crop_with_gravity.miff
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/crop_after.jpg
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/crop_before.jpg
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/crop_resized.jpg
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/crop_resized.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/contrast.jpg
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/composite.gif
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ex/colors.gif
@@ -677,6 +682,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/unsharp_mask.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/viewex.rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/vignette.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/wave.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/writing_mode01.rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/writing_mode02.rb.html
@@ -692,9 +698,8 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/import_export.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pattern_fill.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rotating_text.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/spinner.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/thumbnail.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/vignette.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 @dirrm %%RUBY_SITELIBDIR%%/rvg
-
-