From owner-freebsd-ports Sun Oct 31 13:10:26 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 0C8C914EBE for ; Sun, 31 Oct 1999 13:10:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id NAA83101; Sun, 31 Oct 1999 13:10:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from smtp.teleway.ne.jp (smtp.teleway.ne.jp [203.140.129.13]) by hub.freebsd.org (Postfix) with ESMTP id D025414A29 for ; Sun, 31 Oct 1999 13:06:18 -0800 (PST) (envelope-from yasuf@big.or.jp) Received: from localhost (kokura1-39.teleway.ne.jp [210.234.51.39]) by smtp.teleway.ne.jp (8.9.3+3.2W/3.7W) with ESMTP id GAA00153 for ; Mon, 1 Nov 1999 06:06:14 +0900 (JST) (envelope-from yasuf@big.or.jp) Message-Id: <19991101060613W.yasuf@big.or.jp> Date: Mon, 01 Nov 1999 06:06:13 +0900 From: yasuf@big.or.jp Reply-To: yasuf@big.or.jp To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/14630: Update: x11-toolkits/ruby-gtk Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 14630 >Category: ports >Synopsis: Update: x11-toolkits/ruby-gtk >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 31 13:10:02 PST 1999 >Closed-Date: >Last-Modified: >Originator: Yasuhiro Fukuma >Release: FreeBSD 4.0-CURRENT i386 >Organization: >Environment: >Description: This patch contains: - Updates for ruby-gtk-0.22. Removed file: patches/patch-aa >How-To-Repeat: >Fix: Index: ruby-gtk/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/ruby-gtk/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 1999/10/08 03:30:11 1.4 +++ Makefile 1999/10/31 05:16:49 @@ -1,12 +1,12 @@ # New ports collection makefile for: ruby-gtk -# Version required: 0.21 +# Version required: 0.22 # Date created: 19 April 1999 # Whom: Yasuhiro Fukuma # # $FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.4 1999/10/08 03:30:11 nakai Exp $ # -DISTNAME= ruby-gtk-0.21 +DISTNAME= ruby-gtk-0.22 CATEGORIES= x11-toolkits MASTER_SITES= http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/ \ ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \ @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/gtk PLIST_SUB+= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}" -RUBY= ${PREFIX}/bin/ruby +RUBY= ${LOCALBASE}/bin/ruby RUBY_VER= 1.4 RUBY_ARCH= ${ARCH}-freebsd${OSREL} Index: ruby-gtk/files/md5 =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/ruby-gtk/files/md5,v retrieving revision 1.2 diff -u -r1.2 md5 --- md5 1999/08/28 16:24:18 1.2 +++ md5 1999/10/29 16:19:13 @@ -1 +1 @@ -MD5 (ruby-gtk-0.21.tar.gz) = c93477a649e5982379fcba756ab8825c +MD5 (ruby-gtk-0.22.tar.gz) = ac95ef42846b80ce032f41aa20f61ae5 Index: ruby-gtk/patches/patch-aa =================================================================== RCS file: patch-aa diff -N patch-aa --- /tmp/cvsj77931 Mon Nov 1 05:00:45 1999 +++ /dev/null Mon Nov 1 04:53:06 1999 @@ -1,36 +0,0 @@ ---- extconf.rb.orig Sat Aug 7 02:57:08 1999 -+++ extconf.rb Wed Aug 25 08:44:11 1999 -@@ -8,22 +8,26 @@ - # detect GTK+ (and Imlib) configurations - # - 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? -+ 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.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.") - end Index: ruby-gtk/pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/ruby-gtk/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- PLIST 1999/08/28 16:24:21 1.2 +++ PLIST 1999/10/31 05:14:09 @@ -2,6 +2,7 @@ lib/ruby/%%RUBY_VER%%/gtkcompat.rb share/examples/ruby/gtk/drawing.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 share/examples/ruby/gtk/browser/gtkbrows.rb >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message