diff options
45 files changed, 90 insertions, 298 deletions
diff --git a/devel/ruby-gnome2-atk/PLIST b/devel/ruby-gnome2-atk/PLIST index 992f6827bf4..2ceb20342e1 100644 --- a/devel/ruby-gnome2-atk/PLIST +++ b/devel/ruby-gnome2-atk/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2008/10/22 10:42:03 obache Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/08/12 12:43:08 obache Exp $ +lib/pkgconfig/atk-ruby.pc ${RUBY_VENDORLIB}/atk.rb ${RUBY_VENDORARCHLIB}/atk.${RUBY_DLEXT} ${RUBY_VENDORARCHLIB}/rbatk.h diff --git a/devel/ruby-gnome2-bonobo/PLIST b/devel/ruby-gnome2-bonobo/PLIST index 5935cae1486..1eb5a76859f 100644 --- a/devel/ruby-gnome2-bonobo/PLIST +++ b/devel/ruby-gnome2-bonobo/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:48 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:09 obache Exp $ +lib/pkgconfig/libbonobo-2.0-ruby.pc ${RUBY_VENDORLIB}/bonobo2.rb ${RUBY_VENDORARCHLIB}/bonobo2.${RUBY_DLEXT} diff --git a/devel/ruby-gnome2-bonoboui/PLIST b/devel/ruby-gnome2-bonoboui/PLIST index 56d2715bce4..5c81066d78e 100644 --- a/devel/ruby-gnome2-bonoboui/PLIST +++ b/devel/ruby-gnome2-bonoboui/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:49 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:09 obache Exp $ +lib/pkgconfig/libbonoboui-2.0-ruby.pc ${RUBY_VENDORLIB}/bonoboui2.rb ${RUBY_VENDORARCHLIB}/bonoboui2.${RUBY_DLEXT} diff --git a/devel/ruby-gnome2-gconf/PLIST b/devel/ruby-gnome2-gconf/PLIST index c961da5d2d5..1f1b389bf3c 100644 --- a/devel/ruby-gnome2-gconf/PLIST +++ b/devel/ruby-gnome2-gconf/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:49 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:09 obache Exp $ +lib/pkgconfig/gconf-2.0-ruby.pc ${RUBY_VENDORLIB}/gconf2.rb ${RUBY_VENDORARCHLIB}/gconf2.${RUBY_DLEXT} diff --git a/devel/ruby-gnome2-glib/PLIST b/devel/ruby-gnome2-glib/PLIST index 50876361ed0..3c8a1b21473 100644 --- a/devel/ruby-gnome2-glib/PLIST +++ b/devel/ruby-gnome2-glib/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.6 2008/10/22 10:42:03 obache Exp $ +@comment $NetBSD: PLIST,v 1.7 2009/08/12 12:43:09 obache Exp $ +lib/pkgconfig/glib-2.0-ruby.pc ${RUBY_VENDORLIB}/glib-mkenums.rb ${RUBY_VENDORLIB}/glib2.rb ${RUBY_VENDORARCHLIB}/glib2.${RUBY_DLEXT} diff --git a/devel/ruby-gnome2-libglade/Makefile b/devel/ruby-gnome2-libglade/Makefile index b0f37879b6f..c7a3eb010ff 100644 --- a/devel/ruby-gnome2-libglade/Makefile +++ b/devel/ruby-gnome2-libglade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/10/28 13:43:57 obache Exp $ +# $NetBSD: Makefile,v 1.3 2009/08/12 12:43:09 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-libglade-${VERSION} @@ -12,8 +12,6 @@ RUBY_EXTCONF_SUBDIRS= libglade DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk USE_TOOLS+= pkg-config -INSTALL_TARGET= install - .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" diff --git a/devel/ruby-gnome2-libglade/PLIST b/devel/ruby-gnome2-libglade/PLIST index a2f64a486b3..69a2e41b5ee 100644 --- a/devel/ruby-gnome2-libglade/PLIST +++ b/devel/ruby-gnome2-libglade/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:49 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:09 obache Exp $ bin/ruby-glade-create-template +lib/pkgconfig/libglade-2.0-ruby.pc ${RUBY_VENDORLIB}/libglade2.rb ${RUBY_VENDORARCHLIB}/libglade2.${RUBY_DLEXT} diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile index 35d54bbe2ea..f2ba7f9c841 100644 --- a/devel/ruby-gnome2-pango/Makefile +++ b/devel/ruby-gnome2-pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2008/09/17 00:21:49 obache Exp $ +# $NetBSD: Makefile,v 1.11 2009/08/12 12:43:09 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-pango-${VERSION} @@ -15,8 +15,6 @@ DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-gli USE_TOOLS+= pkg-config -INSTALL_TARGET= install - do-test: ${RUN} cd ${WRKSRC}/pango/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb diff --git a/devel/ruby-gnome2-pango/PLIST b/devel/ruby-gnome2-pango/PLIST index 8adb7661175..2369c5e445d 100644 --- a/devel/ruby-gnome2-pango/PLIST +++ b/devel/ruby-gnome2-pango/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.3 2008/06/19 15:11:45 taca Exp $ +@comment $NetBSD: PLIST,v 1.4 2009/08/12 12:43:09 obache Exp $ +lib/pkgconfig/pango-ruby.pc ${RUBY_VENDORARCHLIB}/pango.${RUBY_DLEXT} ${RUBY_VENDORARCHLIB}/rbpango.h ${RUBY_VENDORARCHLIB}/rbpangoversion.h diff --git a/graphics/ruby-gnome2-gdkpixbuf/PLIST b/graphics/ruby-gnome2-gdkpixbuf/PLIST index cc7fcdb53b7..2ecbf513df1 100644 --- a/graphics/ruby-gnome2-gdkpixbuf/PLIST +++ b/graphics/ruby-gnome2-gdkpixbuf/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2008/06/19 15:12:10 taca Exp $ +@comment $NetBSD: PLIST,v 1.4 2009/08/12 12:43:09 obache Exp $ +lib/pkgconfig/gdk-pixbuf-2.0-ruby.pc ${RUBY_VENDORLIB}/gdk_pixbuf2.rb ${RUBY_VENDORARCHLIB}/gdk_pixbuf2.${RUBY_DLEXT} diff --git a/graphics/ruby-gnome2-gnomecanvas/PLIST b/graphics/ruby-gnome2-gnomecanvas/PLIST index a15de30dd96..a638654f0a2 100644 --- a/graphics/ruby-gnome2-gnomecanvas/PLIST +++ b/graphics/ruby-gnome2-gnomecanvas/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2008/06/19 15:12:35 taca Exp $ +@comment $NetBSD: PLIST,v 1.4 2009/08/12 12:43:09 obache Exp $ +lib/pkgconfig/libgnomecanvas-2.0-ruby.pc ${RUBY_VENDORLIB}/gnomecanvas2.rb ${RUBY_VENDORARCHLIB}/gnomecanvas2.${RUBY_DLEXT} diff --git a/graphics/ruby-gnome2-goocanvas/PLIST b/graphics/ruby-gnome2-goocanvas/PLIST index aad446eacef..71418841f20 100644 --- a/graphics/ruby-gnome2-goocanvas/PLIST +++ b/graphics/ruby-gnome2-goocanvas/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/10/22 10:42:03 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:11 obache Exp $ +lib/pkgconfig/goocanvas-ruby.pc ${RUBY_VENDORLIB}/goocanvas.rb ${RUBY_VENDORARCHLIB}/goocanvas.${RUBY_DLEXT} diff --git a/graphics/ruby-gnome2-gtkglext/PLIST b/graphics/ruby-gnome2-gtkglext/PLIST index f198316ebd9..64742fb616e 100644 --- a/graphics/ruby-gnome2-gtkglext/PLIST +++ b/graphics/ruby-gnome2-gtkglext/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:49 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:09 obache Exp $ +lib/pkgconfig/gtkglext-1.0-ruby.pc ${RUBY_VENDORLIB}/gtkglext.rb ${RUBY_VENDORARCHLIB}/gtkglext.${RUBY_DLEXT} diff --git a/graphics/ruby-gnome2-libart/PLIST b/graphics/ruby-gnome2-libart/PLIST index 25cb0cf055c..6a27ba067d6 100644 --- a/graphics/ruby-gnome2-libart/PLIST +++ b/graphics/ruby-gnome2-libart/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.5 2008/10/22 10:42:03 obache Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/08/12 12:43:09 obache Exp $ +lib/pkgconfig/libart-2.0-ruby.pc ${RUBY_VENDORLIB}/libart2.rb ${RUBY_VENDORARCHLIB}/libart2.${RUBY_DLEXT} ${RUBY_VENDORARCHLIB}/rbart.h diff --git a/graphics/ruby-gnome2-rsvg/PLIST b/graphics/ruby-gnome2-rsvg/PLIST index 30918bbe67c..dd2cc15b463 100644 --- a/graphics/ruby-gnome2-rsvg/PLIST +++ b/graphics/ruby-gnome2-rsvg/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2008/06/19 15:13:26 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2009/08/12 12:43:10 obache Exp $ +lib/pkgconfig/librsvg-2.0-ruby.pc ${RUBY_VENDORLIB}/rsvg2.rb ${RUBY_VENDORARCHLIB}/rsvg2.${RUBY_DLEXT} diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common index f0692addce1..78a3dff1025 100644 --- a/meta-pkgs/ruby-gnome2/Makefile.common +++ b/meta-pkgs/ruby-gnome2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2009/05/31 09:00:48 obache Exp $ +# $NetBSD: Makefile.common,v 1.10 2009/08/12 12:43:08 obache Exp $ # # used by devel/ruby-gnome2-atk/Makefile # used by devel/ruby-gnome2-bonobo/Makefile @@ -27,7 +27,7 @@ # used by x11/ruby-gnome2-panelapplet/Makefile # used by x11/ruby-gnome2-vte/Makefile -DISTNAME= ruby-gnome2-all-0.19.0 +DISTNAME= ruby-gnome2-all-0.19.1 CATEGORIES+= ruby MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ruby-gnome2/} @@ -38,9 +38,13 @@ MAINTAINER= dieter.NetBSD@pandora.be HOMEPAGE= http://ruby-gnome2.sourceforge.jp/ LICENSE= gnu-lgpl-v2.1 -VERSION= 0.19.0 +VERSION= 0.19.1 RUBY_HAS_ARCHLIB= yes USE_RUBY_EXTCONF= yes +INSTALL_TARGET= install + +INSTALLATION_DIRS= lib/pkgconfig + .include "../../lang/ruby/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo index 8ffdf7bfcc2..b7eb439841e 100644 --- a/meta-pkgs/ruby-gnome2/distinfo +++ b/meta-pkgs/ruby-gnome2/distinfo @@ -1,16 +1,6 @@ -$NetBSD: distinfo,v 1.9 2009/05/31 09:00:48 obache Exp $ +$NetBSD: distinfo,v 1.10 2009/08/12 12:43:08 obache Exp $ -SHA1 (ruby-gnome2-all-0.19.0.tar.gz) = 59e20b43a2592d63373bba72430e72ffd84e4f68 -RMD160 (ruby-gnome2-all-0.19.0.tar.gz) = fb56d0e3e63a82d56c7b9efdb859ededba0fbbce -Size (ruby-gnome2-all-0.19.0.tar.gz) = 2321941 bytes -SHA1 (patch-aa) = bb42e339a8441f7d35951b383b8f3d0379e8a28e -SHA1 (patch-ab) = 5a4277ae9d007927de7667458b0c8da49c15bcea -SHA1 (patch-ac) = baa182ff65cddbb623e943c0f8ff2875a73c1e51 -SHA1 (patch-ad) = f872f01bd22a0d0f46068cbaed4d44ca98b073c5 -SHA1 (patch-af) = b37ac30eb73fd2d3eb3aadd76d5aeb7a930eeabe -SHA1 (patch-ag) = 24cdbb883400d56e308bcc3034852b2a82f11930 -SHA1 (patch-an) = 218d7dcdafad3baefb438fb645260c3b419f75e9 -SHA1 (patch-ao) = 988b73484ba7eccfd15e52c1e59c91991378408d -SHA1 (patch-ap) = 9cdbc50e8f51ab7fff97206b157e8d1a5f717f3c -SHA1 (patch-ar) = b6efa6163ce8dbb184269e60e2823d4151a7aa8c -SHA1 (patch-as) = b5829f4f36e364bc306a62f20f67a37a37a28f1d +SHA1 (ruby-gnome2-all-0.19.1.tar.gz) = 7b42fd26e54eb82c006f7aeacaf91efc417bdbde +RMD160 (ruby-gnome2-all-0.19.1.tar.gz) = 3161d8e2d99ba91ac3a8c6ee51992462b5413e10 +Size (ruby-gnome2-all-0.19.1.tar.gz) = 2330644 bytes +SHA1 (patch-al) = 8960917a6409b99602ed81163327b9be44c57637 diff --git a/meta-pkgs/ruby-gnome2/patches/patch-aa b/meta-pkgs/ruby-gnome2/patches/patch-aa deleted file mode 100644 index f4a2ccbb12c..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2009/05/31 09:00:48 obache Exp $ - -Install files into vendor. - ---- atk/src/depend.orig 2008-01-03 02:56:49.000000000 +0000 -+++ atk/src/depend -@@ -1,3 +1,3 @@ --install: -- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbatk.h $(sitearchdir)$(target_prefix) -- @$(RUBY) -run -e install -- -m 0644 -v rbatkversion.h $(sitearchdir)$(target_prefix) -+install-so: -+ $(INSTALL_DATA) $(srcdir)/rbatk.h $(RUBYARCHDIR) -+ $(INSTALL_DATA) rbatkversion.h $(RUBYARCHDIR) diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ab b/meta-pkgs/ruby-gnome2/patches/patch-ab deleted file mode 100644 index 0881a736f59..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2009/05/31 09:00:48 obache Exp $ - -Install files in vendor. - ---- glib/src/depend.orig 2009-05-18 12:47:11.000000000 +0000 -+++ glib/src/depend -@@ -1,6 +1,6 @@ --install: -- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbglib.h $(sitearchdir)$(target_prefix) -- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgutil.h $(sitearchdir)$(target_prefix) -- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgobject.h $(sitearchdir)$(target_prefix) -- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgcompat.h $(sitearchdir)$(target_prefix) -- @$(RUBY) -run -e install -- -m 0644 -v glib-enum-types.h $(sitearchdir)$(target_prefix) -+install-so: -+ $(INSTALL_DATA) $(srcdir)/rbglib.h $(RUBYARCHDIR) -+ $(INSTALL_DATA) $(srcdir)/rbgutil.h $(RUBYARCHDIR) -+ $(INSTALL_DATA) $(srcdir)/rbgobject.h $(RUBYARCHDIR) -+ $(INSTALL_DATA) $(srcdir)/rbgcompat.h $(RUBYARCHDIR) -+ $(INSTALL_DATA) glib-enum-types.h $(RUBYARCHDIR) diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ac b/meta-pkgs/ruby-gnome2/patches/patch-ac deleted file mode 100644 index a212eaf3d6d..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2009/05/31 09:00:48 obache Exp $ - -Also look at vendor. - ---- glib/src/lib/mkmf-gnome2.rb.orig 2008-09-13 11:18:06.000000000 +0000 -+++ glib/src/lib/mkmf-gnome2.rb -@@ -257,7 +257,7 @@ def make_version_header(app_name, pkgnam - end - - def check_ruby_func -- $CPPFLAGS << " -I$(sitearchdir) " -+ $CPPFLAGS << " -I$(vendorarchdir) " - - #Other options - ruby_header = "ruby.h" diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ad b/meta-pkgs/ruby-gnome2/patches/patch-ad deleted file mode 100644 index 3382461f3e4..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2009/05/31 09:00:48 obache Exp $ - -Install files in vendor. - ---- gtk/src/depend.orig 2008-09-30 13:00:42.000000000 +0000 -+++ gtk/src/depend -@@ -1,3 +1,3 @@ --install: -- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtk.h $(sitearchdir)$(target_prefix) -- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtkconversions.h $(sitearchdir)$(target_prefix) -+install-so: -+ $(INSTALL_DATA) $(srcdir)/rbgtk.h $(RUBYARCHDIR) -+ $(INSTALL_DATA) $(srcdir)/rbgtkconversions.h $(RUBYARCHDIR) diff --git a/meta-pkgs/ruby-gnome2/patches/patch-af b/meta-pkgs/ruby-gnome2/patches/patch-af deleted file mode 100644 index 32f92d5b850..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-af,v 1.4 2009/05/31 09:00:48 obache Exp $ - -Install files in vendor. - ---- libart/src/depend.orig 2008-01-03 02:59:38.000000000 +0000 -+++ libart/src/depend -@@ -1,2 +1,2 @@ --install: -- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbart.h $(sitearchdir)$(target_prefix) -+install-so: -+ $(INSTALL_DATA) $(srcdir)/rbart.h $(RUBYARCHDIR) diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ag b/meta-pkgs/ruby-gnome2/patches/patch-ag deleted file mode 100644 index ada0f9c7c1a..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2009/05/31 09:00:48 obache Exp $ - -Install files in vendor. - ---- pango/src/depend.orig 2008-01-03 03:00:57.000000000 +0000 -+++ pango/src/depend -@@ -1,3 +1,3 @@ --install: -- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbpango.h $(sitearchdir)$(target_prefix) -- @$(RUBY) -run -e install -- -m 0644 -v rbpangoversion.h $(sitearchdir)$(target_prefix) -+install-so: -+ $(INSTALL_DATA) $(srcdir)/rbpango.h $(RUBYARCHDIR) -+ $(INSTALL_DATA) rbpangoversion.h $(RUBYARCHDIR) diff --git a/meta-pkgs/ruby-gnome2/patches/patch-al b/meta-pkgs/ruby-gnome2/patches/patch-al new file mode 100644 index 00000000000..2b5daff21d4 --- /dev/null +++ b/meta-pkgs/ruby-gnome2/patches/patch-al @@ -0,0 +1,18 @@ +$NetBSD: patch-al,v 1.3 2009/08/12 12:43:08 obache Exp $ + +--- vte/extconf.rb.orig 2009-07-26 06:16:52.000000000 +0000 ++++ vte/extconf.rb +@@ -25,10 +25,12 @@ add_depend_package("atk", "atk/src", TOP + vte_headers = ["vte/vte.h"] + have_type("VteTerminalCursorBlinkMode", vte_headers) + ++vte_version_header = nil + unless have_macro("VTE_CHECK_VERSION", vte_headers) + make_version_header("VTE", PACKAGE_ID) +- create_pkg_config_file('VTE', 'src/rbvteversion.h', 'vte-ruby.pc') ++ vte_version_header = 'src/rbvteversion.h' + end + + create_makefile_at_srcdir(PACKAGE_NAME, SRCDIR, "-DRUBY_VTE_COMPILATION") ++create_pkg_config_file('VTE', vte_version_header, 'vte-ruby.pc') + create_top_makefile diff --git a/meta-pkgs/ruby-gnome2/patches/patch-an b/meta-pkgs/ruby-gnome2/patches/patch-an deleted file mode 100644 index b5fd8c914a0..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-an +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-an,v 1.3 2009/05/31 09:00:48 obache Exp $ - -use gem version rcairo as fallback - ---- gdkpixbuf/lib/gdk_pixbuf2.rb.orig 2007-10-23 12:51:24.000000000 +0000 -+++ gdkpixbuf/lib/gdk_pixbuf2.rb -@@ -1,6 +1,11 @@ - require 'glib2' - begin -+ begin - require 'cairo' -+ rescue LoadError -+ require 'rubygems' -+ require 'cairo' -+ end - rescue LoadError - end - require 'gdk_pixbuf2.so' diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ao b/meta-pkgs/ruby-gnome2/patches/patch-ao deleted file mode 100644 index cb1e13f7b7a..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-ao +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ao,v 1.3 2009/05/31 09:00:48 obache Exp $ - -remove cairo loading because Ruby/Pango has tried it. - ---- gtk/src/lib/gtk2/base.rb.orig 2008-05-12 14:44:38.000000000 +0000 -+++ gtk/src/lib/gtk2/base.rb -@@ -12,10 +12,6 @@ - require 'glib2' - require 'atk' - require 'pango' --begin -- require 'cairo' --rescue LoadError --end - require 'gtk2.so' - require 'gdk_pixbuf2' - diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ap b/meta-pkgs/ruby-gnome2/patches/patch-ap deleted file mode 100644 index d492fc69a54..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-ap +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2009/05/31 09:00:48 obache Exp $ - -use gem version rcairo as fallback - ---- pango/src/lib/pango.rb.orig 2007-12-28 09:01:22.000000000 +0000 -+++ pango/src/lib/pango.rb -@@ -8,7 +8,12 @@ - - require 'glib2' - begin -+ begin - require 'cairo' -+ rescue LoadError -+ require 'rubygems' -+ require 'cairo' -+ end - rescue LoadError - end - require 'pango.so' diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ar b/meta-pkgs/ruby-gnome2/patches/patch-ar deleted file mode 100644 index a89de3d7712..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-ar +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2009/05/31 09:00:48 obache Exp $ - -use GHashTable instead of Ruby's Hash to avoid object creation while GC. - ---- glib/src/rbgobj_type.c.orig 2009-05-18 12:47:11.000000000 +0000 -+++ glib/src/rbgobj_type.c -@@ -8,5 +8,5 @@ - created at: Sun Jun 9 20:31:47 JST 2002 - -- Copyright (C) 2002-2008 Ruby-GNOME2 Project Team -+ Copyright (C) 2002-2009 Ruby-GNOME2 Project Team - Copyright (C) 2002,2003 Masahiro Sakai - -@@ -29,5 +29,5 @@ static ID id_superclass; - static ID id_lock; - static ID id_unlock; --static VALUE gtype_to_cinfo; -+static GHashTable *gtype_to_cinfo; - static VALUE klass_to_cinfo; - -@@ -132,9 +132,7 @@ rbgobj_lookup_class_by_gtype_without_loc - return NULL; - -- c = rb_hash_aref(gtype_to_cinfo, INT2NUM(gtype)); -- if (!NIL_P(c)) { -- Data_Get_Struct(c, RGObjClassInfo, cinfo); -+ cinfo = g_hash_table_lookup(gtype_to_cinfo, GUINT_TO_POINTER(gtype)); -+ if (cinfo) - return cinfo; -- } - - if (!create_class) -@@ -185,5 +183,5 @@ rbgobj_lookup_class_by_gtype_without_loc - - rb_hash_aset(klass_to_cinfo, cinfo->klass, c); -- rb_hash_aset(gtype_to_cinfo, INT2NUM(gtype), c); -+ g_hash_table_insert(gtype_to_cinfo, GUINT_TO_POINTER(gtype), cinfo); - - if (G_TYPE_IS_CLASSED(gtype)) -@@ -336,17 +334,25 @@ rbgobj_register_class(VALUE klass, - gboolean gtype2klass) - { -- RGObjClassInfo* cinfo; -- VALUE c = Data_Make_Struct(rb_cData, RGObjClassInfo, cinfo_mark, NULL, cinfo); -- -- cinfo->klass = klass; -- cinfo->gtype = gtype; -- cinfo->mark = NULL; -- cinfo->free = NULL; -- cinfo->flags = 0; -- -+ RGObjClassInfo* cinfo = NULL; -+ VALUE c = Qnil; -+ -+ if (klass2gtype) -+ c = Data_Make_Struct(rb_cData, RGObjClassInfo, cinfo_mark, NULL, cinfo); -+ if (gtype2klass && !cinfo) -+ cinfo = g_new(RGObjClassInfo, 1); -+ -+ if (cinfo) { -+ cinfo->klass = klass; -+ cinfo->gtype = gtype; -+ cinfo->mark = NULL; -+ cinfo->free = NULL; -+ cinfo->flags = 0; -+ } -+ - if (klass2gtype) -- rb_hash_aset(klass_to_cinfo, cinfo->klass, c); -+ rb_hash_aset(klass_to_cinfo, cinfo->klass, c); -+ - if (gtype2klass) -- rb_hash_aset(gtype_to_cinfo, INT2NUM(gtype), c); -+ g_hash_table_insert(gtype_to_cinfo, GUINT_TO_POINTER(gtype), cinfo); - } - -@@ -363,7 +369,6 @@ Init_typemap() - id_superclass = rb_intern("superclass"); - -- rb_global_variable(>ype_to_cinfo); -+ gtype_to_cinfo = g_hash_table_new(g_direct_hash, g_direct_equal); - rb_global_variable(&klass_to_cinfo); -- gtype_to_cinfo = rb_hash_new(); - klass_to_cinfo = rb_hash_new(); - diff --git a/meta-pkgs/ruby-gnome2/patches/patch-as b/meta-pkgs/ruby-gnome2/patches/patch-as deleted file mode 100644 index f8de6ba09f0..00000000000 --- a/meta-pkgs/ruby-gnome2/patches/patch-as +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-as,v 1.1 2009/05/31 09:00:48 obache Exp $ - -choose only readable(existing) header files - ---- gtkmozembed/extconf.rb.orig 2009-05-18 12:47:19.000000000 +0000 -+++ gtkmozembed/extconf.rb -@@ -77,7 +77,7 @@ create_makefile_at_srcdir(PACKAGE_NAME, - end - headers = include_paths.inject([]) do |result, path| - gtkmozembed_h = File.join(path, "gtkmozembed.h") -- result += [gtkmozembed_h] if gtkmozembed_h -+ result += [gtkmozembed_h] if File.readable?(gtkmozembed_h) - result - end - glib_mkenums(enum_type_prefix, headers, "GTK_TYPE_", ["gtkmozembed.h"]) diff --git a/multimedia/ruby-gnome2-gstreamer/PLIST b/multimedia/ruby-gnome2-gstreamer/PLIST index 8a1fc2ab26c..84fc61d084a 100644 --- a/multimedia/ruby-gnome2-gstreamer/PLIST +++ b/multimedia/ruby-gnome2-gstreamer/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:49 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:10 obache Exp $ +lib/pkgconfig/gstreamer-0.10-ruby.pc ${RUBY_VENDORLIB}/gst.rb ${RUBY_VENDORARCHLIB}/gst.${RUBY_DLEXT} diff --git a/print/ruby-gnome2-gnomeprint/Makefile b/print/ruby-gnome2-gnomeprint/Makefile index eb67d3f0570..492bd6d5a1e 100644 --- a/print/ruby-gnome2-gnomeprint/Makefile +++ b/print/ruby-gnome2-gnomeprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/09/17 00:21:49 obache Exp $ +# $NetBSD: Makefile,v 1.7 2009/08/12 12:43:10 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gnomeprint-${VERSION} @@ -14,11 +14,6 @@ DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pa DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart USE_TOOLS+= pkg-config -# Need rblibgnomeprintversion.h for build ruby-gnome2-gnomeprintui. -post-install: - ${INSTALL_DATA} ${WRKSRC}/gnomeprint/src/rblibgnomeprintversion.h \ - ${DESTDIR}${RUBY_VENDORARCHLIBDIR} - do-test: ${RUN} cd ${WRKSRC}/gnomeprint/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb diff --git a/print/ruby-gnome2-gnomeprint/PLIST b/print/ruby-gnome2-gnomeprint/PLIST index b77c2122ab2..ca4518b080f 100644 --- a/print/ruby-gnome2-gnomeprint/PLIST +++ b/print/ruby-gnome2-gnomeprint/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.3 2008/09/17 00:21:49 obache Exp $ +@comment $NetBSD: PLIST,v 1.4 2009/08/12 12:43:10 obache Exp $ +lib/pkgconfig/libgnomeprint-2.2-ruby.pc ${RUBY_VENDORLIB}/gnomeprint2.rb ${RUBY_VENDORARCHLIB}/gnomeprint2.${RUBY_DLEXT} ${RUBY_VENDORARCHLIB}/rblibgnomeprintversion.h diff --git a/print/ruby-gnome2-gnomeprintui/PLIST b/print/ruby-gnome2-gnomeprintui/PLIST index 0e2f1d9e036..66e1237a8b8 100644 --- a/print/ruby-gnome2-gnomeprintui/PLIST +++ b/print/ruby-gnome2-gnomeprintui/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:49 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:10 obache Exp $ +lib/pkgconfig/libgnomeprintui-2.2-ruby.pc ${RUBY_VENDORLIB}/gnomeprintui2.rb ${RUBY_VENDORARCHLIB}/gnomeprintui2.${RUBY_DLEXT} diff --git a/print/ruby-gnome2-poppler/PLIST b/print/ruby-gnome2-poppler/PLIST index 82e5c9e2e54..268e190973d 100644 --- a/print/ruby-gnome2-poppler/PLIST +++ b/print/ruby-gnome2-poppler/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2008/06/19 15:14:15 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2009/08/12 12:43:10 obache Exp $ +lib/pkgconfig/poppler-ruby.pc ${RUBY_VENDORLIB}/poppler.rb ${RUBY_VENDORARCHLIB}/poppler.${RUBY_DLEXT} diff --git a/sysutils/ruby-gnome2-gnomevfs/PLIST b/sysutils/ruby-gnome2-gnomevfs/PLIST index a08f32f2941..43509619e97 100644 --- a/sysutils/ruby-gnome2-gnomevfs/PLIST +++ b/sysutils/ruby-gnome2-gnomevfs/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:50 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:10 obache Exp $ +lib/pkgconfig/gnome-vfs-2.0-ruby.pc ${RUBY_VENDORLIB}/gnomevfs.rb ${RUBY_VENDORARCHLIB}/gnomevfs.${RUBY_DLEXT} diff --git a/www/ruby-gnome2-gtkhtml2/PLIST b/www/ruby-gnome2-gtkhtml2/PLIST index 906b0bb10a2..367fef5d802 100644 --- a/www/ruby-gnome2-gtkhtml2/PLIST +++ b/www/ruby-gnome2-gtkhtml2/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:50 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:10 obache Exp $ +lib/pkgconfig/libgtkhtml-2.0-ruby.pc ${RUBY_VENDORLIB}/gtkhtml2.rb ${RUBY_VENDORARCHLIB}/gtkhtml2.${RUBY_DLEXT} diff --git a/www/ruby-gnome2-gtkmozembed/Makefile b/www/ruby-gnome2-gtkmozembed/Makefile index 7dec1881a35..7a9be2faf9e 100644 --- a/www/ruby-gnome2-gtkmozembed/Makefile +++ b/www/ruby-gnome2-gtkmozembed/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2009/08/06 08:49:39 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2009/08/12 12:43:10 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtkmozembed-${VERSION} -PKGREVISION= 1 COMMENT= Ruby binding of gtkmozembed CATEGORIES= www diff --git a/www/ruby-gnome2-gtkmozembed/PLIST b/www/ruby-gnome2-gtkmozembed/PLIST index 3a0dcebd5fa..07f47270699 100644 --- a/www/ruby-gnome2-gtkmozembed/PLIST +++ b/www/ruby-gnome2-gtkmozembed/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:50 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:10 obache Exp $ +lib/pkgconfig/mozilla-gtkmozembed-ruby.pc ${RUBY_VENDORLIB}/gtkmozembed.rb ${RUBY_VENDORARCHLIB}/gtkmozembed.${RUBY_DLEXT} diff --git a/x11/ruby-gnome2-gnome/PLIST b/x11/ruby-gnome2-gnome/PLIST index d095c1ead13..e38a9c4c261 100644 --- a/x11/ruby-gnome2-gnome/PLIST +++ b/x11/ruby-gnome2-gnome/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2008/06/19 15:14:44 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2009/08/12 12:43:10 obache Exp $ +lib/pkgconfig/libgnome-2.0-ruby.pc ${RUBY_VENDORLIB}/gnome2.rb ${RUBY_VENDORARCHLIB}/gnome2.${RUBY_DLEXT} diff --git a/x11/ruby-gnome2-gtk/PLIST b/x11/ruby-gnome2-gtk/PLIST index 09a3ff590b1..10def494de6 100644 --- a/x11/ruby-gnome2-gtk/PLIST +++ b/x11/ruby-gnome2-gtk/PLIST @@ -1,6 +1,10 @@ -@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:25:06 joerg Exp $ +@comment $NetBSD: PLIST,v 1.9 2009/08/12 12:43:11 obache Exp $ +lib/pkgconfig/gtk+-2.0-ruby.pc ${RUBY_VENDORLIB}/gtk2.rb ${RUBY_VENDORLIB}/gtk2/base.rb ${RUBY_VENDORARCHLIB}/gtk2.${RUBY_DLEXT} +${RUBY_VENDORARCHLIB}/rbgdk.h +${RUBY_VENDORARCHLIB}/rbgdkconversions.h ${RUBY_VENDORARCHLIB}/rbgtk.h ${RUBY_VENDORARCHLIB}/rbgtkconversions.h +${RUBY_VENDORARCHLIB}/rbgtkmacros.h diff --git a/x11/ruby-gnome2-gtksourceview/PLIST b/x11/ruby-gnome2-gtksourceview/PLIST index 80fe375f974..f5d3a9fdd8f 100644 --- a/x11/ruby-gnome2-gtksourceview/PLIST +++ b/x11/ruby-gnome2-gtksourceview/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:50 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:11 obache Exp $ +lib/pkgconfig/gtksourceview-1.0-ruby.pc ${RUBY_VENDORLIB}/gtksourceview.rb ${RUBY_VENDORARCHLIB}/gtksourceview.${RUBY_DLEXT} diff --git a/x11/ruby-gnome2-gtksourceview2/PLIST b/x11/ruby-gnome2-gtksourceview2/PLIST index 7333447f096..2e214db87da 100644 --- a/x11/ruby-gnome2-gtksourceview2/PLIST +++ b/x11/ruby-gnome2-gtksourceview2/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/10/22 10:42:03 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:11 obache Exp $ +lib/pkgconfig/gtksourceview-2.0-ruby.pc ${RUBY_VENDORLIB}/gtksourceview2.rb ${RUBY_VENDORARCHLIB}/gtksourceview2.${RUBY_DLEXT} diff --git a/x11/ruby-gnome2-panelapplet/PLIST b/x11/ruby-gnome2-panelapplet/PLIST index 328ad0f86ec..1f0eaeeb01d 100644 --- a/x11/ruby-gnome2-panelapplet/PLIST +++ b/x11/ruby-gnome2-panelapplet/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.3 2009/05/31 09:00:49 obache Exp $ +@comment $NetBSD: PLIST,v 1.4 2009/08/12 12:43:11 obache Exp $ +lib/pkgconfig/libpanelapplet-2.0-ruby.pc ${RUBY_VENDORARCHLIB}/panelapplet2.${RUBY_DLEXT} ${RUBY_VENDORARCHLIB}/panelapplet2_main.${RUBY_DLEXT} ${RUBY_VENDORLIB}/panelapplet2.rb diff --git a/x11/ruby-gnome2-vte/Makefile b/x11/ruby-gnome2-vte/Makefile index 7df29ba373c..7adb1346747 100644 --- a/x11/ruby-gnome2-vte/Makefile +++ b/x11/ruby-gnome2-vte/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2009/06/11 08:10:26 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2009/08/12 12:43:11 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-vte-${VERSION} -PKGREVISION= 2 COMMENT= Ruby binding of vte CATEGORIES= x11 diff --git a/x11/ruby-gnome2-vte/PLIST b/x11/ruby-gnome2-vte/PLIST index 38c962c5b84..145bbdb9722 100644 --- a/x11/ruby-gnome2-vte/PLIST +++ b/x11/ruby-gnome2-vte/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2008/09/17 00:21:50 obache Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:43:11 obache Exp $ +lib/pkgconfig/vte-ruby.pc ${RUBY_VENDORLIB}/vte.rb ${RUBY_VENDORARCHLIB}/vte.${RUBY_DLEXT} |