From 8d47ba38ad79eec18c0b5433845b86216c962264 Mon Sep 17 00:00:00 2001 From: sakamoto Date: Tue, 14 Dec 1999 07:23:20 +0000 Subject: Update ruby-gtk to 0.22 Changes 0.22 from 0.21 some bugfix add more method for gtk/imlib. --- x11/ruby-gtk/Makefile | 10 +++++----- x11/ruby-gtk/files/md5 | 4 ++-- x11/ruby-gtk/files/patch-sum | 4 ++-- x11/ruby-gtk/patches/patch-aa | 40 +++++++--------------------------------- x11/ruby-gtk/pkg/PLIST | 13 +++++++------ 5 files changed, 23 insertions(+), 48 deletions(-) (limited to 'x11/ruby-gtk') diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile index 83db0f61ef9..7b31142d517 100644 --- a/x11/ruby-gtk/Makefile +++ b/x11/ruby-gtk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 1999/11/29 08:20:01 rh Exp $ +# $NetBSD: Makefile,v 1.6 1999/12/14 07:23:20 sakamoto Exp $ # FreeBSD Id: ports/x11-toolkits/ruby-gtk/Makefile,v 1.3 1999/08/31 02:59:33 peter Exp -DISTNAME= ruby-gtk-0.21 +DISTNAME= ruby-gtk-0.22 CATEGORIES= x11 MASTER_SITES= http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/ \ ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \ @@ -12,9 +12,9 @@ MASTER_SITES= http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/ \ ftp://mirror.nucba.ac.jp/mirror/ruby/contrib/ MAINTAINER= sakamoto@netbsd.org -HOMEPAGE= http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/gtk.html +HOMEPAGE= http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/gtk.html.en -DEPENDS+= ruby-1.4.2:../../lang/ruby +DEPENDS+= ruby-1.4.*:../../lang/ruby DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= imlib-*:../../graphics/imlib @@ -26,7 +26,7 @@ PLIST_SUBST= RUBY_VERSION=${RUBY_VERSION} RUBY= ${PREFIX}/bin/ruby do-configure: - @(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${GTK_CONFIG}) + @(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb) post-install: ${INSTALL_DATA} ${WRKSRC}/lib/*.rb ${PREFIX}/lib/ruby/${RUBY_VERSION} diff --git a/x11/ruby-gtk/files/md5 b/x11/ruby-gtk/files/md5 index 5ae2c9fe3e2..a73dcec5157 100644 --- a/x11/ruby-gtk/files/md5 +++ b/x11/ruby-gtk/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1999/09/17 05:00:21 sakamoto Exp $ +$NetBSD: md5,v 1.3 1999/12/14 07:23:21 sakamoto Exp $ -MD5 (ruby-gtk-0.21.tar.gz) = c93477a649e5982379fcba756ab8825c +MD5 (ruby-gtk-0.22.tar.gz) = ac95ef42846b80ce032f41aa20f61ae5 diff --git a/x11/ruby-gtk/files/patch-sum b/x11/ruby-gtk/files/patch-sum index 860f005abe0..e0cf1e8d315 100644 --- a/x11/ruby-gtk/files/patch-sum +++ b/x11/ruby-gtk/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.1 1999/09/17 05:00:21 sakamoto Exp $ +$NetBSD: patch-sum,v 1.2 1999/12/14 07:23:21 sakamoto Exp $ -MD5 (patch-aa) = f9192647a145ae61c2a4837c4c8d6016 +MD5 (patch-aa) = 4294caa20bb3d3d7633f77e8fd80129b diff --git a/x11/ruby-gtk/patches/patch-aa b/x11/ruby-gtk/patches/patch-aa index 33f6e77da78..6a37de45a10 100644 --- a/x11/ruby-gtk/patches/patch-aa +++ b/x11/ruby-gtk/patches/patch-aa @@ -1,37 +1,11 @@ -$NetBSD: patch-aa,v 1.2 1999/09/17 05:00:22 sakamoto Exp $ +$NetBSD: patch-aa,v 1.3 1999/12/14 07:23:21 sakamoto Exp $ ---- extconf.rb.orig Sat Aug 7 02:57:08 1999 -+++ extconf.rb Fri Sep 17 12:54:56 1999 -@@ -9,20 +9,24 @@ - # - if /mswin32/ !~ PLATFORM -- config_cmds = [ -- ["imlib-config", "--libs-gdk", "--cflags-gdk"], -- ["gtk-config", "--libs", "--cflags"], -- ] -+ config_cmds = ["imlib-config", "gtk-config"] - if ARGV.size > 0 -- config_cmds.unshift([ARGV[0], "--libs", "--cflags"]) -+ config_cmds.unshift(ARGV[0]) - end - - begin -- config_cmds.each do |config_cmd, config_libs, config_cflags| -+ config_cmds.each do |config_cmd| - version = `#{config_cmd} --version` - if not version.chomp.empty? +--- extconf.rb.orig Sat Oct 9 18:22:29 1999 ++++ extconf.rb Tue Dec 14 15:00:11 1999 +@@ -29,5 +29,5 @@ + config_libs, config_cflags = "--libs", "--cflags" + end - $LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.split(/(-l.*)/) -+ if /^imlib/ === File.basename(config_cmd) -+ with_imlib = true -+ config_libs, config_cflags = "--libs-gdk", "--cflags-gdk" -+ else -+ with_imlib = false -+ config_libs, config_cflags = "--libs", "--cflags" -+ end -+ $LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.gsub("-Wl,","").split(/(-l.*)/) ++ $LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.gsub("-Wl,", "").split(/(-l.*)/) $libs = libs.join(' ') + ' ' + $libs $CFLAGS = `#{config_cmd} #{config_cflags}`.chomp -- if /^imlib/ === config_cmd -+ if with_imlib - $CFLAGS = $CFLAGS + " -DHAVE_GDKIMLIB" - STDERR.puts("Imlib support enabled.") diff --git a/x11/ruby-gtk/pkg/PLIST b/x11/ruby-gtk/pkg/PLIST index 4c581caf449..12a369d593c 100644 --- a/x11/ruby-gtk/pkg/PLIST +++ b/x11/ruby-gtk/pkg/PLIST @@ -1,19 +1,20 @@ -@comment $NetBSD: PLIST,v 1.3 1999/09/17 05:21:33 sakamoto Exp $ +@comment $NetBSD: PLIST,v 1.4 1999/12/14 07:23:21 sakamoto Exp $ lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/gtk.so lib/ruby/${RUBY_VERSION}/gtkcompat.rb -share/examples/ruby/gtk/drawing.rb -share/examples/ruby/gtk/helloworld.rb -share/examples/ruby/gtk/text.rb -share/examples/ruby/gtk/texthook.rb share/examples/ruby/gtk/browser/gtkbrows.rb share/examples/ruby/gtk/browser/rbbr_gtk.rb share/examples/ruby/gtk/browser/rbbr_rb.rb share/examples/ruby/gtk/browser/rbdump.rb -@dirrm share/examples/ruby/gtk/browser +share/examples/ruby/gtk/drawing.rb share/examples/ruby/gtk/gdkimlib/sample1.rb share/examples/ruby/gtk/gdkimlib/sample2.rb share/examples/ruby/gtk/gdkimlib/sample3.rb share/examples/ruby/gtk/gdkimlib/sample4.rb share/examples/ruby/gtk/gdkimlib/sample5.rb +share/examples/ruby/gtk/helloworld.rb +share/examples/ruby/gtk/testim.rb +share/examples/ruby/gtk/text.rb +share/examples/ruby/gtk/texthook.rb @dirrm share/examples/ruby/gtk/gdkimlib +@dirrm share/examples/ruby/gtk/browser @dirrm share/examples/ruby/gtk -- cgit v1.2.3