Update ruby-gnome2* to 0.16.0.

Changes: * Fixed serious bugs (depends on GC) * Support GTK+-2.10 and the latest version of each libraries. * Don't include Ruby/GStreamer and Ruby/Libgda. We cancel to support Ruby/GStreamer and Ruby/Libgda. * Cancel to support ruby-1.6.x and GTK+-2.4 or earlier.
author: minskim <minskim> 2007-01-29 06:42:33 +0000
committer: minskim <minskim> 2007-01-29 06:42:33 +0000
commit: 2e1228493ba4bdd4212eb13d5451d3a5831a2cad (patch)
tree: dc3422136f696d9c8dc8fc8c5491d66a8ffc237f
parent: 792e33f3f32437132de7dbedfc6fe84084f0f6bc (diff)
download: pkgsrc-2e1228493ba4bdd4212eb13d5451d3a5831a2cad.tar.gz
15 files changed, 72 insertions, 57 deletions
diff --git a/devel/ruby-gnome2-atk/Makefile b/devel/ruby-gnome2-atk/Makefile
index 971eeaece1d..2d26cf8915b 100644
--- a/devel/ruby-gnome2-atk/Makefile
+++ b/devel/ruby-gnome2-atk/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2006/07/25 16:49:05 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/29 06:42:33 minskim Exp $
 #
 
-PKGNAME=		ruby-gnome2-atk-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-atk-${VERSION}
 COMMENT=		Ruby binding of ATK-1.0.x or later
 CATEGORIES=		devel
 
+CONFLICTS+=		ruby-gnome2-atk-[0-9]*
+
 RUBY_EXTCONF_SUBDIRS=	atk
 
-DEPENDS+=		ruby-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 USE_TOOLS+=		pkg-config
 
 .include "../../devel/atk/buildlink3.mk"
diff --git a/devel/ruby-gnome2-glib/Makefile b/devel/ruby-gnome2-glib/Makefile
index 1076400e5a4..8570e259459 100644
--- a/devel/ruby-gnome2-glib/Makefile
+++ b/devel/ruby-gnome2-glib/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2006/07/25 16:49:05 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/29 06:42:34 minskim Exp $
 #
 
-PKGNAME=		ruby-gnome2-glib-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}
 COMMENT=		Ruby binding of GLib-2.x
 CATEGORIES=		devel
 
+CONFLICTS+=		ruby-gnome2-glib-[0-9]*
+
 RUBY_EXTCONF_SUBDIRS=	glib
 
 USE_TOOLS+=		pkg-config
diff --git a/devel/ruby-gnome2-glib/PLIST b/devel/ruby-gnome2-glib/PLIST
index ca71fe5e6a0..0d82b8c44c9 100644
--- a/devel/ruby-gnome2-glib/PLIST
+++ b/devel/ruby-gnome2-glib/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/15 16:12:55 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/01/29 06:42:34 minskim Exp $
+${RUBY_SITELIBDIR}/glib-mkenums.rb
 ${RUBY_SITELIBDIR}/glib2.rb
 ${RUBY_SITEARCHLIBDIR}/glib2.${RUBY_DLEXT}
 ${RUBY_SITELIBDIR}/mkmf-gnome2.rb
diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile
index ee07974941c..cea6e2fc955 100644
--- a/devel/ruby-gnome2-pango/Makefile
+++ b/devel/ruby-gnome2-pango/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2006/07/25 16:49:05 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/29 06:42:34 minskim Exp $
 #
 
-PKGNAME=		ruby-gnome2-pango-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-pango-${VERSION}
 COMMENT=		Ruby binding of pango-1.x
 CATEGORIES=		devel fonts
 
+CONFLICTS+=		ruby-gnome2-pango-[0-9]*
+
 RUBY_EXTCONF_SUBDIRS=	pango
 
-DEPENDS+=		ruby-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 
 USE_TOOLS+=		pkg-config
 
diff --git a/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk
index 10e3c733f5d..45afea2fe1d 100644
--- a/devel/ruby-gnome2-pango/buildlink3.mk
+++ b/devel/ruby-gnome2-pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2007/01/29 06:42:34 minskim Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 RUBY_GNOME2_PANGO_BUILDLINK3_MK:=	${RUBY_GNOME2_PANGO_BUILDLINK3_MK}+
@@ -12,8 +12,7 @@ BUILDLINK_PACKAGES+=	ruby-gnome2-pango
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ruby-gnome2-pango
 
 .if !empty(RUBY_GNOME2_PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ruby-gnome2-pango+=	ruby-gnome2-pango>=0.14.1
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango?=	ruby-gnome2-pango>=0.14.1nb2
+BUILDLINK_API_DEPENDS.ruby-gnome2-pango+=	${RUBY_PKGPREFIX}-gnome2-pango>=0.16.0
 BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?=	../../devel/ruby-gnome2-pango
 .endif	# RUBY_GNOME2_PANGO_BUILDLINK3_MK
 
diff --git a/graphics/ruby-gnome2-gdkpixbuf/Makefile b/graphics/ruby-gnome2-gdkpixbuf/Makefile
index 7d9dfc35c54..10957a83597 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/Makefile
+++ b/graphics/ruby-gnome2-gdkpixbuf/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2006/07/25 16:49:05 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/29 06:42:34 minskim Exp $
 #
 
-PKGNAME=		ruby-gnome2-gdkpixbuf-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf-${VERSION}
 COMMENT=		Ruby binding of GdkPixbuf-2.x
 CATEGORIES=		graphics devel
 
+CONFLICTS+=		ruby-gnome2-gdkpixbuf-[0-9]*
+
 RUBY_EXTCONF_SUBDIRS=	gdkpixbuf
 
-DEPENDS+=		ruby-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 USE_TOOLS+=		pkg-config
 
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/graphics/ruby-gnome2-gnomecanvas/Makefile b/graphics/ruby-gnome2-gnomecanvas/Makefile
index 528b4c6e7bf..f40ebc182d3 100644
--- a/graphics/ruby-gnome2-gnomecanvas/Makefile
+++ b/graphics/ruby-gnome2-gnomecanvas/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2006/07/25 16:49:05 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/29 06:42:34 minskim Exp $
 #
 
-PKGNAME=		ruby-gnome2-gnomecanvas-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnomecanvas-${VERSION}
 COMMENT=		Ruby binding of GnomeCanvas-2.x
 CATEGORIES=		graphics gnome
 
+CONFLICTS+=		ruby-gnome2-gnomecanvas-[0-9]*
+
 RUBY_EXTCONF_SUBDIRS=	gnomecanvas
 
-DEPENDS+=		ruby-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart
-DEPENDS+=		ruby-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
 
 USE_TOOLS+=		pkg-config
 
diff --git a/graphics/ruby-gnome2-libart/Makefile b/graphics/ruby-gnome2-libart/Makefile
index 364cb80a525..3fa9fdf173b 100644
--- a/graphics/ruby-gnome2-libart/Makefile
+++ b/graphics/ruby-gnome2-libart/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2006/07/25 16:49:05 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2007/01/29 06:42:34 minskim Exp $
 #
 
-PKGNAME=		ruby-gnome2-libart-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-libart-${VERSION}
 COMMENT=		Ruby binding of Libart_lgpl
 CATEGORIES=		graphics
 
+CONFLICTS+=		ruby-gnome2-libart-[0-9]*
+
 RUBY_EXTCONF_SUBDIRS=	libart
 
-DEPENDS+=		ruby-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 USE_TOOLS+=		pkg-config
 
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/meta-pkgs/ruby-gnome2/Makefile b/meta-pkgs/ruby-gnome2/Makefile
index a5133f29722..a2ef1b6ffa3 100644
--- a/meta-pkgs/ruby-gnome2/Makefile
+++ b/meta-pkgs/ruby-gnome2/Makefile
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:10:06 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/29 06:42:34 minskim Exp $
 #
 
-PKGNAME=	ruby-gnome2-${VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-gnome2-${VERSION}
 COMMENT=	Set of Ruby language bindings for GNOME2
 DISTFILES=	# empty
-PKGREVISION=	2
 CATEGORIES=	meta-pkgs gnome
 
-DEPENDS+=	ruby-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
-DEPENDS+=	ruby-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
-DEPENDS+=	ruby-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
-DEPENDS+=	ruby-gnome2-gnome>=${VERSION}:../../x11/ruby-gnome2-gnome
-DEPENDS+=	ruby-gnome2-gnomecanvas>=${VERSION}:../../graphics/ruby-gnome2-gnomecanvas
-DEPENDS+=	ruby-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-DEPENDS+=	ruby-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart
-DEPENDS+=	ruby-gnome2-panelapplet>=${VERSION}:../../x11/ruby-gnome2-panelapplet
-DEPENDS+=	ruby-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnome>=${VERSION}:../../x11/ruby-gnome2-gnome
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnomecanvas>=${VERSION}:../../graphics/ruby-gnome2-gnomecanvas
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-panelapplet>=${VERSION}:../../x11/ruby-gnome2-panelapplet
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
@@ -25,4 +24,5 @@ NO_MTREE=	yes
 
 do-install:	# empty
 
+.include "../../lang/ruby/rubyversion.mk"
 .include "${.CURDIR}/Makefile.common"
diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common
index 7a7ab0b7a05..53fa83f52dd 100644
--- a/meta-pkgs/ruby-gnome2/Makefile.common
+++ b/meta-pkgs/ruby-gnome2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/07/25 16:49:05 minskim Exp $
+# $NetBSD: Makefile.common,v 1.3 2007/01/29 06:42:34 minskim Exp $
 #
 
 DISTNAME=		ruby-gnome2-all-${VERSION}
@@ -10,7 +10,7 @@ DISTINFO_FILE=		${.CURDIR}/../../meta-pkgs/ruby-gnome2/distinfo
 MAINTAINER=		dieter.NetBSD@pandora.be
 HOMEPAGE=		http://ruby-gnome2.sourceforge.jp/
 
-VERSION=		0.15.0
+VERSION=		0.16.0
 RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo
index 29e45418fa4..08b6d43d827 100644
--- a/meta-pkgs/ruby-gnome2/distinfo
+++ b/meta-pkgs/ruby-gnome2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2006/07/25 16:49:05 minskim Exp $
+$NetBSD: distinfo,v 1.3 2007/01/29 06:42:34 minskim Exp $
 
-SHA1 (ruby-gnome2-all-0.15.0.tar.gz) = c7919b445b5a8de5fe61e07179384c9152f91bdc
-RMD160 (ruby-gnome2-all-0.15.0.tar.gz) = 8bcd1929d77720359c718cdee31628bb7b1587b3
-Size (ruby-gnome2-all-0.15.0.tar.gz) = 1273856 bytes
+SHA1 (ruby-gnome2-all-0.16.0.tar.gz) = 488f6c1f139060e005f336c9c854c4dc5b3e6b7c
+RMD160 (ruby-gnome2-all-0.16.0.tar.gz) = c83c7cdcf633ad5cc213180f641a6c8f18002a9c
+Size (ruby-gnome2-all-0.16.0.tar.gz) = 1208856 bytes
diff --git a/x11/ruby-gnome2-gnome/Makefile b/x11/ruby-gnome2-gnome/Makefile
index dbf1d92f141..2e226f0cb27 100644
--- a/x11/ruby-gnome2-gnome/Makefile
+++ b/x11/ruby-gnome2-gnome/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2006/09/16 12:20:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/29 06:42:34 minskim Exp $
 #
 
-PKGNAME=		ruby-gnome2-gnome-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnome-${VERSION}
 COMMENT=		Ruby binding of libgnome/libgnomeui-2.x
-PKGREVISION=		1
 CATEGORIES=		gnome x11
 
+CONFLICTS+=		ruby-gnome2-gnome-[0-9]*
+
 RUBY_EXTCONF_SUBDIRS=	gnome
 
-DEPENDS+=		ruby-gnome2-gnomecanvas>=${VERSION}:../../graphics/ruby-gnome2-gnomecanvas
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gnomecanvas>=${VERSION}:../../graphics/ruby-gnome2-gnomecanvas
 
 USE_TOOLS+=		pkg-config
 
diff --git a/x11/ruby-gnome2-gtk/Makefile b/x11/ruby-gnome2-gtk/Makefile
index b31e82eafe4..40a8125e02a 100644
--- a/x11/ruby-gnome2-gtk/Makefile
+++ b/x11/ruby-gnome2-gtk/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2006/07/25 16:49:05 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/29 06:42:34 minskim Exp $
 #
 
-PKGNAME=		ruby-gnome2-gtk-${VERSION}
-COMMENT=		Ruby binding of GTK+-2.0.x
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtk-${VERSION}
+COMMENT=		Ruby binding of GTK+-2.x
 CATEGORIES=		x11
 
+CONFLICTS+=		ruby-gnome2-gtk-[0-9]*
+
 RUBY_EXTCONF_SUBDIRS=	gtk
 
-DEPENDS+=		ruby-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
-DEPENDS+=		ruby-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
-DEPENDS+=		ruby-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
 
 USE_TOOLS+=		pkg-config
 
diff --git a/x11/ruby-gnome2-gtk/PLIST b/x11/ruby-gnome2-gtk/PLIST
index 99971827197..37e41eeb173 100644
--- a/x11/ruby-gnome2-gtk/PLIST
+++ b/x11/ruby-gnome2-gtk/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2006/09/07 15:58:00 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/01/29 06:42:34 minskim Exp $
 ${RUBY_SITELIBDIR}/gtk2.rb
 ${RUBY_SITELIBDIR}/gtk2/base.rb
 ${RUBY_SITEARCHLIBDIR}/gtk2.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/gtk20.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/gtk22.${RUBY_DLEXT}
 @dirrm ${RUBY_SITELIBDIR}/gtk2
diff --git a/x11/ruby-gnome2-panelapplet/Makefile b/x11/ruby-gnome2-panelapplet/Makefile
index bda6da5ccf9..b104c6f422a 100644
--- a/x11/ruby-gnome2-panelapplet/Makefile
+++ b/x11/ruby-gnome2-panelapplet/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2006/09/16 12:20:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/29 06:42:34 minskim Exp $
 #
 
-PKGNAME=		ruby-gnome2-panelapplet-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-panelapplet-${VERSION}
 COMMENT=		Ruby binding of libpanel-applet-2.6.x
-PKGREVISION=		1
 CATEGORIES=		x11 gnome
 
+CONFLICTS+=		ruby-gnome2-panelapplet-[0-9]*
+
 RUBY_EXTCONF_SUBDIRS=	panel-applet
 
-DEPENDS+=		ruby-gnome2-gnome>=${VERSION}:../../x11/ruby-gnome2-gnome
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gnome>=${VERSION}:../../x11/ruby-gnome2-gnome
 
 USE_TOOLS+=		pkg-config
author	minskim <minskim>	2007-01-29 06:42:33 +0000
committer	minskim <minskim>	2007-01-29 06:42:33 +0000
commit	2e1228493ba4bdd4212eb13d5451d3a5831a2cad (patch)
tree	dc3422136f696d9c8dc8fc8c5491d66a8ffc237f
parent	792e33f3f32437132de7dbedfc6fe84084f0f6bc (diff)
download	pkgsrc-2e1228493ba4bdd4212eb13d5451d3a5831a2cad.tar.gz