Finish move from ruby-rcairo to ruby-cairo.

6 files changed, 2 insertions, 70 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 90380d9a449..0c86b91c71d 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.725 2016/01/04 01:44:14 markd Exp $
+# $NetBSD: Makefile,v 1.726 2016/01/11 23:50:27 wiz Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -442,6 +442,7 @@ SUBDIR+=	refocus-it
 SUBDIR+=	resize_image
 SUBDIR+=	ristretto
 SUBDIR+=	ruby-RMagick
+SUBDIR+=	ruby-cairo
 SUBDIR+=	ruby-chunky_png
 SUBDIR+=	ruby-color
 SUBDIR+=	ruby-color-japanese
@@ -458,7 +459,6 @@ SUBDIR+=	ruby-imlib2
 SUBDIR+=	ruby-mini-magick
 SUBDIR+=	ruby-oily_png
 SUBDIR+=	ruby-opengl
-SUBDIR+=	ruby-rcairo
 SUBDIR+=	s10sh
 SUBDIR+=	sane-backends
 SUBDIR+=	sane-frontends
diff --git a/graphics/ruby-rcairo/DESCR b/graphics/ruby-rcairo/DESCR
deleted file mode 100644
index 676f2acf2d1..00000000000
--- a/graphics/ruby-rcairo/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Cairo is a 2D graphics library with support for multiple output
-devices.  rcairo provides ruby bindings to cairo.
diff --git a/graphics/ruby-rcairo/Makefile b/graphics/ruby-rcairo/Makefile
deleted file mode 100644
index d957ba88742..00000000000
--- a/graphics/ruby-rcairo/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2015/04/25 14:23:19 tnn Exp $
-
-DISTNAME=		rcairo-1.14.1
-PKGNAME=		${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=		1
-CATEGORIES=		graphics
-MASTER_SITES=		http://cairographics.org/releases/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://cairographics.org/rcairo/
-COMMENT=		Ruby bindings for cairo
-LICENSE=		ruby-license OR gnu-gpl-v2
-
-USE_RUBY_EXTCONF=	yes
-
-#do-test:
-#	${RUN} cd ${WRKSRC}; \
-#	${SETENV} ${TEST_ENV} ${RUBY} test/run-test.rb
-
-BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.2.0
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../lang/ruby/modules.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-rcairo/PLIST b/graphics/ruby-rcairo/PLIST
deleted file mode 100644
index 98b0caf8415..00000000000
--- a/graphics/ruby-rcairo/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.13 2012/09/10 09:23:37 obache Exp $
-${RUBY_VENDORLIB}/cairo.rb
-${RUBY_VENDORLIB}/cairo/color.rb
-${RUBY_VENDORLIB}/cairo/colors.rb
-${RUBY_VENDORLIB}/cairo/constants.rb
-${RUBY_VENDORLIB}/cairo/context.rb
-${RUBY_VENDORLIB}/cairo/context/blur.rb
-${RUBY_VENDORLIB}/cairo/context/circle.rb
-${RUBY_VENDORLIB}/cairo/context/color.rb
-${RUBY_VENDORLIB}/cairo/context/path.rb
-${RUBY_VENDORLIB}/cairo/context/rectangle.rb
-${RUBY_VENDORLIB}/cairo/context/triangle.rb
-${RUBY_VENDORLIB}/cairo/device.rb
-${RUBY_VENDORLIB}/cairo/paper.rb
-${RUBY_VENDORLIB}/cairo/papers.rb
-${RUBY_VENDORLIB}/cairo/path.rb
-${RUBY_VENDORLIB}/cairo/pattern.rb
-${RUBY_VENDORLIB}/cairo/point.rb
-${RUBY_VENDORLIB}/cairo/surface.rb
-${RUBY_VENDORARCHLIB}/cairo.${RUBY_DLEXT}
-${RUBY_VENDORARCHLIB}/rb_cairo.h
diff --git a/graphics/ruby-rcairo/buildlink3.mk b/graphics/ruby-rcairo/buildlink3.mk
deleted file mode 100644
index 50ff9f1e43a..00000000000
--- a/graphics/ruby-rcairo/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.22 2015/04/25 14:23:19 tnn Exp $
-
-BUILDLINK_TREE+=	ruby-rcairo
-
-.if !defined(RUBY_RCAIRO_BUILDLINK3_MK)
-RUBY_RCAIRO_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ruby-rcairo+=	${RUBY_PKGPREFIX}-rcairo>=1.6.0
-BUILDLINK_ABI_DEPENDS.ruby-rcairo+=	${RUBY_PKGPREFIX}-rcairo>=1.14.1nb1
-BUILDLINK_PKGSRCDIR.ruby-rcairo?=	../../graphics/ruby-rcairo
-
-.include "../../graphics/cairo/buildlink3.mk"
-.endif # RUBY_RCAIRO_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-ruby-rcairo
diff --git a/graphics/ruby-rcairo/distinfo b/graphics/ruby-rcairo/distinfo
deleted file mode 100644
index 48f172f20c5..00000000000
--- a/graphics/ruby-rcairo/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.25 2015/11/03 21:34:19 agc Exp $
-
-SHA1 (rcairo-1.14.1.tar.gz) = 5004067d807dfd8c81c5d0093f431ea61d0c7b82
-RMD160 (rcairo-1.14.1.tar.gz) = f9cd702fcb3baece2c29b58775daf8caa7cc7ff5
-SHA512 (rcairo-1.14.1.tar.gz) = 5cf36e03e8609cd267ca14687cceb848e89c140cc3d405e33ad7f4481a5cae8c9c0f4defd304bbea56dccc65e43a9220fe4a7fcd2b96f41005eab36e6e599f2d
-Size (rcairo-1.14.1.tar.gz) = 101350 bytes