Date: Sat, 28 Aug 1999 16:27:31 +0900 From: yasuf@big.or.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/13437: Update: x11-tookits/ruby-gtk Message-ID: <19990828162731T.yasuf@big.or.jp>
next in thread | raw e-mail | index | archive | help
>Number: 13437 >Category: ports >Synopsis: Re-request: Update: x11-toolkits/ruby-gtk >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 28 00:30:00 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Yasuhiro Fukuma >Release: FreeBSD 4.0-CURRENT i386 >Organization: >Environment: >Description: Hmm, the update patch I sent as a follow-up to PR: ports/13308 seems not to have been applied. Now I'll resend it... This patch contains: - Updates for ruby-gtk-0.21. New file: patches/patch-aa Removed file: patches/patch-ae >How-To-Repeat: >Fix: Index: ruby-gtk/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/ruby-gtk/Makefile,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Makefile --- Makefile 1999/08/26 21:22:49 1.1.1.1 +++ Makefile 1999/08/28 04:35:15 @@ -1,12 +1,12 @@ # New ports collection makefile for: ruby-gtk -# Version required: 0.20 +# Version required: 0.21 # Date created: 19 April 1999 # Whom: Yasuhiro Fukuma <yasuf@big.or.jp> # # $Id: Makefile,v 1.1.1.1 1999/08/26 21:22:49 cpiazza Exp $ # -DISTNAME= ruby-gtk-0.20 +DISTNAME= ruby-gtk-0.21 CATEGORIES= x11-toolkits MASTER_SITES= http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/ \ ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \ @@ -30,15 +30,25 @@ RUBY_VER= 1.4 RUBY_ARCH= ${ARCH}-freebsd${OSREL} +.if defined(NO_IMLIB) GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +.else +LIB_DEPENDS+= Imlib.4:${PORTSDIR}/graphics/imlib +GTK_CONFIG?= ${X11BASE}/bin/imlib-config +.endif do-configure: @cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${GTK_CONFIG} post-install: + ${INSTALL_DATA} ${WRKSRC}/lib/*.rb ${PREFIX}/lib/ruby/${RUBY_VER} ${MKDIR} ${PREFIX}/share/examples/ruby/gtk ${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${PREFIX}/share/examples/ruby/gtk ${MKDIR} ${PREFIX}/share/examples/ruby/gtk/browser ${INSTALL_DATA} ${WRKSRC}/doc/*.rb ${PREFIX}/share/examples/ruby/gtk/browser +.if !defined(NO_IMLIB) + ${MKDIR} ${PREFIX}/share/examples/ruby/gtk/gdkimlib + ${INSTALL_DATA} ${WRKSRC}/sample/gdkimlib/*.rb ${PREFIX}/share/examples/ruby/gtk/gdkimlib +.endif .include <bsd.port.mk> Index: ruby-gtk/files/md5 =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/ruby-gtk/files/md5,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 md5 --- md5 1999/08/26 21:22:49 1.1.1.1 +++ md5 1999/08/28 04:34:33 @@ -1 +1 @@ -MD5 (ruby-gtk-0.20.tar.gz) = f1baf7fd43dde9ab44cb4e783c8d431c +MD5 (ruby-gtk-0.21.tar.gz) = c93477a649e5982379fcba756ab8825c Index: ruby-gtk/patches/patch-aa =================================================================== RCS file: patch-aa diff -N patch-aa --- /dev/null Sat Aug 28 10:51:02 1999 +++ patch-aa Sat Aug 28 13:34:39 1999 @@ -0,0 +1,36 @@ +--- 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/patches/patch-ae =================================================================== RCS file: patch-ae diff -N patch-ae --- /tmp/cvsP25352 Sat Aug 28 13:38:15 1999 +++ /dev/null Sat Aug 28 10:51:02 1999 @@ -1,16 +0,0 @@ ---- src/makedefconst.rb.orig Wed Jul 14 22:40:08 1999 -+++ src/makedefconst.rb Sat Aug 14 04:10:44 1999 -@@ -113,11 +113,9 @@ - if /mswin32/ =~ PLATFORM - makefile.puts(" lib /OUT:\$@ \$?") - else -- makefile.puts(" \$(AR) -rs \$@ \$?") -+ makefile.puts(" \$(AR) -r \$@ \$?"); -+ makefile.puts(" \$(RANLIB) \$@") - end --makefile.puts("# if your \$(AR) don't accept -s options, test below:") --makefile.puts("# \$(AR) -r \$@"); --makefile.puts("# \$(RANLIB) \$@") - - makefile.close - cfile.close Index: ruby-gtk/pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/ruby-gtk/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- PLIST 1999/08/26 21:22:50 1.1.1.1 +++ PLIST 1999/08/28 04:34:46 @@ -1,4 +1,5 @@ lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/gtk.so +lib/ruby/%%RUBY_VER%%/gtkcompat.rb share/examples/ruby/gtk/drawing.rb share/examples/ruby/gtk/helloworld.rb share/examples/ruby/gtk/text.rb @@ -8,4 +9,10 @@ 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/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 +@dirrm share/examples/ruby/gtk/gdkimlib @dirrm share/examples/ruby/gtk >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990828162731T.yasuf>