Date: Thu, 26 Aug 1999 08:40:03 -0700 (PDT) From: Yasuhiro Fukuma <yasuf@big.or.jp> To: freebsd-ports@FreeBSD.org Subject: Re: ports/13308: New port: x11-toolkits/ruby-gtk Message-ID: <199908261540.IAA62131@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/13308; it has been noted by GNATS. From: Yasuhiro Fukuma <yasuf@big.or.jp> To: freebsd-gnats-submit@freebsd.org Cc: Subject: Re: ports/13308: New port: x11-toolkits/ruby-gtk Date: Fri, 27 Aug 1999 00:31:02 +0900 Updates for ruby-gtk-0.21. diff -ruN ruby-gtk-19990815/Makefile ruby-gtk/Makefile --- ruby-gtk-19990815/Makefile Sun Aug 15 02:20:15 1999 +++ ruby-gtk/Makefile Wed Aug 25 09:28:19 1999 @@ -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$ # -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> diff -ruN ruby-gtk-19990815/files/md5 ruby-gtk/files/md5 --- ruby-gtk-19990815/files/md5 Sat Aug 14 03:57:11 1999 +++ ruby-gtk/files/md5 Wed Aug 25 08:32:48 1999 @@ -1 +1 @@ -MD5 (ruby-gtk-0.20.tar.gz) = f1baf7fd43dde9ab44cb4e783c8d431c +MD5 (ruby-gtk-0.21.tar.gz) = c93477a649e5982379fcba756ab8825c diff -ruN ruby-gtk-19990815/patches/patch-aa ruby-gtk/patches/patch-aa --- ruby-gtk-19990815/patches/patch-aa Thu Jan 1 09:00:00 1970 +++ ruby-gtk/patches/patch-aa Wed Aug 25 08:49:09 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 diff -ruN ruby-gtk-19990815/patches/patch-ae ruby-gtk/patches/patch-ae --- ruby-gtk-19990815/patches/patch-ae Sat Aug 14 05:05:13 1999 +++ ruby-gtk/patches/patch-ae Thu Jan 1 09:00:00 1970 @@ -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 diff -ruN ruby-gtk-19990815/pkg/PLIST ruby-gtk/pkg/PLIST --- ruby-gtk-19990815/pkg/PLIST Sat Aug 14 05:39:58 1999 +++ ruby-gtk/pkg/PLIST Wed Aug 25 09:45:30 1999 @@ -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 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?199908261540.IAA62131>